Merge pull request #114 from uktrade/bugfix/external-sources-startTim…

…e-fix fix: Change external sources cards to use startTime instead of published
uktrade · Aug 27, 2019 · 2643c3d · 2643c3d
2 parents ae9b5f2 + 5cf1d66
commit 2643c3d
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/fixtures/activity_feed/companies_house/accounts_are_due.json b/fixtures/activity_feed/companies_house/accounts_are_due.json
@@ -19,6 +19,7 @@
     "dit:shareholderFunds": 1,
     "dit:taxonomy": "http://some.url/with/stuff/2019-07-27",
     "id": "dit:externalSources:companies_house.accounts:5d39ab9ac0d4899610cd65e4",
+    "startTime": "2020-12-13T01:11:18",
     "type": [
       "Event",
       "dit:Accounts"

diff --git a/fixtures/activity_feed/companies_house/incorporated.json b/fixtures/activity_feed/companies_house/incorporated.json
@@ -40,6 +40,7 @@
       "99000 - Activities of extraterritorial organisations and bodies"
     ],
     "id": "dit:externalSources:companies_house.companies:7",
+    "startTime": "1970-10-03T02:18:21",
     "type": [
       "Organization",
       "dit:Company"

diff --git a/fixtures/activity_feed/hmrc/export_of_goods.json b/fixtures/activity_feed/hmrc/export_of_goods.json
@@ -13,6 +13,7 @@
   "type": "Announce",
   "object": {
     "id": "dit:externalSources:hmrc.exporters:5d39b0c9a2b09a36f9f243bf",
+    "startTime": "1879-01-05T06:53:47",
     "type": [
       "Event",
       "dit:Export"

diff --git a/src/activity-feed/activity-feed-cards/CompaniesHouseAccount.jsx b/src/activity-feed/activity-feed-cards/CompaniesHouseAccount.jsx
@@ -30,8 +30,7 @@ export default class CompaniesHouseAccount extends React.PureComponent {
 
   render() {
     const { activity, showDetails } = this.props
-
-    const published = get(activity, 'published')
+    const startTime = get(activity, 'object.startTime')
     const reference = get(activity, 'object.name')
     const taxonomy = get(activity, 'dit:taxonomy')
     const summary = get(activity, 'summary')
@@ -52,7 +51,7 @@ export default class CompaniesHouseAccount extends React.PureComponent {
             summary={summary}
           />
 
-          <CardMeta startTime={published} />
+          <CardMeta startTime={startTime} />
         </CardHeader>
 
         <CardDetails

diff --git a/src/activity-feed/activity-feed-cards/CompaniesHouseCompany.jsx b/src/activity-feed/activity-feed-cards/CompaniesHouseCompany.jsx
@@ -34,7 +34,7 @@ export default class CompaniesHouseCompany extends React.PureComponent {
   render() {
     const { activity, showDetails } = this.props
 
-    const published = get(activity, 'published')
+    const startTime = get(activity, 'object.startTime')
     const reference = get(activity, 'object.name')
 
     const summary = get(activity, 'summary')
@@ -64,7 +64,7 @@ export default class CompaniesHouseCompany extends React.PureComponent {
             subHeading="Company records show that"
             summary={summary}
           />
-          <CardMeta startTime={published} />
+          <CardMeta startTime={startTime} />
         </CardHeader>
 
         <CardDetails

diff --git a/src/activity-feed/activity-feed-cards/HmrcExporter.jsx b/src/activity-feed/activity-feed-cards/HmrcExporter.jsx
@@ -32,8 +32,7 @@ export default class HmrcExporter extends React.PureComponent {
 
   render() {
     const { activity, showDetails } = this.props
-
-    const published = get(activity, 'published')
+    const startTime = get(activity, 'object.startTime')
     const reference = get(activity, 'object.attributedTo.name')
     const summary = get(activity, 'summary')
     const exportItemCodes = get(activity, 'object.dit:exportItemCodes')
@@ -55,7 +54,7 @@ export default class HmrcExporter extends React.PureComponent {
             subHeading="Exporters records show that"
             summary={summary}
           />
-          <CardMeta startTime={published} />
+          <CardMeta startTime={startTime} />
         </CardHeader>
 
         <CardDetails