Skip to content

Commit

Permalink
Add country code fields for organisations
Browse files Browse the repository at this point in the history
  • Loading branch information
MiroslavGatsanoga committed May 9, 2019
1 parent d634e35 commit 44b1917
Show file tree
Hide file tree
Showing 4 changed files with 104 additions and 54 deletions.
25 changes: 15 additions & 10 deletions concept/model.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,21 @@ type ConcordedConcept struct {
PersonUUID string `json:"personUUID,omitempty"`
TerminationDate string `json:"terminationDate,omitempty"`
// Organisation
CountryCode string `json:"countryCode,omitempty"`
CountryOfIncorporation string `json:"countryOfIncorporation,omitempty"`
FormerNames []string `json:"formerNames,omitempty"`
TradeNames []string `json:"tradeNames,omitempty"`
LeiCode string `json:"leiCode,omitempty"`
PostalCode string `json:"postalCode,omitempty"`
ProperName string `json:"properName,omitempty"`
ShortName string `json:"shortName,omitempty"`
YearFounded int `json:"yearFounded,omitempty"`
IsDeprecated bool `json:"isDeprecated,omitempty"`
CountryCode string `json:"countryCode,omitempty"`
CountryOfRisk string `json:"countryOfRisk,omitempty"`
CountryOfIncorporation string `json:"countryOfIncorporation,omitempty"`
CountryOfOperations string `json:"countryOfOperations,omitempty"`
CountryOfRiskUUID string `json:"countryOfRiskUUID,omitempty"`
CountryOfIncorporationUUID string `json:"countryOfIncorporationUUID,omitempty"`
CountryOfOperationsUUID string `json:"countryOfOperationsUUID,omitempty"`
FormerNames []string `json:"formerNames,omitempty"`
TradeNames []string `json:"tradeNames,omitempty"`
LeiCode string `json:"leiCode,omitempty"`
PostalCode string `json:"postalCode,omitempty"`
ProperName string `json:"properName,omitempty"`
ShortName string `json:"shortName,omitempty"`
YearFounded int `json:"yearFounded,omitempty"`
IsDeprecated bool `json:"isDeprecated,omitempty"`
// Location
ISO31661 string `json:"iso31661,omitempty"`
// Source representations
Expand Down
15 changes: 15 additions & 0 deletions concept/service.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -484,9 +484,24 @@ func mergeCanonicalInformation(c ConcordedConcept, s s3.Concept, scopeNoteOption
if s.CountryCode != "" {
c.CountryCode = s.CountryCode
}
if s.CountryOfRisk != "" {
c.CountryOfRisk = s.CountryOfRisk
}
if s.CountryOfIncorporation != "" {
c.CountryOfIncorporation = s.CountryOfIncorporation
}
if s.CountryOfOperations != "" {
c.CountryOfOperations = s.CountryOfOperations
}
if s.CountryOfRiskUUID != "" {
c.CountryOfRiskUUID = s.CountryOfRiskUUID
}
if s.CountryOfIncorporationUUID != "" {
c.CountryOfIncorporationUUID = s.CountryOfIncorporationUUID
}
if s.CountryOfOperationsUUID != "" {
c.CountryOfOperationsUUID = s.CountryOfOperationsUUID
}
if s.PostalCode != "" {
c.PostalCode = s.PostalCode
}
Expand Down
91 changes: 58 additions & 33 deletions concept/service_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -520,12 +520,17 @@ func TestAggregateService_GetConcordedConcept_Organisation(t *testing.T) {
"Castletown Thermostats",
"Steam Plc",
},
CountryCode: "GB",
CountryOfIncorporation: "IM",
PostalCode: "IM9 2RG",
YearFounded: 1951,
EmailAddress: "info@strix.com",
LeiCode: "213800KZEW5W6BZMNT62",
CountryCode: "GB",
CountryOfRisk: "GB",
CountryOfIncorporation: "IM",
CountryOfOperations: "GB",
CountryOfRiskUUID: "GB_UUID",
CountryOfIncorporationUUID: "IM_UUID",
CountryOfOperationsUUID: "GB_UUID",
PostalCode: "IM9 2RG",
YearFounded: 1951,
EmailAddress: "info@strix.com",
LeiCode: "213800KZEW5W6BZMNT62",
SourceRepresentations: []s3.Concept{
{
UUID: "c28fa0b4-4245-11e8-842f-0ed5f89f718b",
Expand All @@ -547,13 +552,18 @@ func TestAggregateService_GetConcordedConcept_Organisation(t *testing.T) {
"Castletown Thermostats",
"Steam Plc",
},
CountryCode: "GB",
CountryOfIncorporation: "IM",
PostalCode: "IM9 2RG",
YearFounded: 1951,
EmailAddress: "info@strix.com",
LeiCode: "213800KZEW5W6BZMNT62",
ParentOrganisation: "123",
CountryCode: "GB",
CountryOfRisk: "GB",
CountryOfIncorporation: "IM",
CountryOfOperations: "GB",
CountryOfRiskUUID: "GB_UUID",
CountryOfIncorporationUUID: "IM_UUID",
CountryOfOperationsUUID: "GB_UUID",
PostalCode: "IM9 2RG",
YearFounded: 1951,
EmailAddress: "info@strix.com",
LeiCode: "213800KZEW5W6BZMNT62",
ParentOrganisation: "123",
},
},
}
Expand Down Expand Up @@ -588,12 +598,17 @@ func TestAggregateService_GetConcordedConcept_PublicCompany(t *testing.T) {
"Steam Plc",
"Test FT Concorded Organisation",
},
CountryCode: "GB",
CountryOfIncorporation: "IM",
PostalCode: "IM9 2RG",
YearFounded: 1951,
EmailAddress: "info@strix.com",
LeiCode: "213800KZEW5W6BZMNT62",
CountryCode: "GB",
CountryOfRisk: "GB",
CountryOfIncorporation: "IM",
CountryOfOperations: "GB",
CountryOfRiskUUID: "GB_UUID",
CountryOfIncorporationUUID: "IM_UUID",
CountryOfOperationsUUID: "GB_UUID",
PostalCode: "IM9 2RG",
YearFounded: 1951,
EmailAddress: "info@strix.com",
LeiCode: "213800KZEW5W6BZMNT62",
SourceRepresentations: []s3.Concept{
{
UUID: "c28fa0b4-4245-11e8-842f-0ed5f89f718b",
Expand All @@ -615,13 +630,18 @@ func TestAggregateService_GetConcordedConcept_PublicCompany(t *testing.T) {
"Castletown Thermostats",
"Steam Plc",
},
CountryCode: "GB",
CountryOfIncorporation: "IM",
PostalCode: "IM9 2RG",
YearFounded: 1951,
EmailAddress: "info@strix.com",
LeiCode: "213800KZEW5W6BZMNT62",
ParentOrganisation: "123",
CountryCode: "GB",
CountryOfRisk: "GB",
CountryOfIncorporation: "IM",
CountryOfOperations: "GB",
CountryOfRiskUUID: "GB_UUID",
CountryOfIncorporationUUID: "IM_UUID",
CountryOfOperationsUUID: "GB_UUID",
PostalCode: "IM9 2RG",
YearFounded: 1951,
EmailAddress: "info@strix.com",
LeiCode: "213800KZEW5W6BZMNT62",
ParentOrganisation: "123",
},
{
UUID: "a141f50f-31d7-4f89-8143-eec971e54ba8",
Expand Down Expand Up @@ -1062,13 +1082,18 @@ func setupTestService(clientStatusCode int, writerResponse string) (Service, *mo
"Castletown Thermostats",
"Steam Plc",
},
CountryCode: "GB",
CountryOfIncorporation: "IM",
PostalCode: "IM9 2RG",
YearFounded: 1951,
EmailAddress: "info@strix.com",
LeiCode: "213800KZEW5W6BZMNT62",
ParentOrganisation: "123",
CountryCode: "GB",
CountryOfRisk: "GB",
CountryOfIncorporation: "IM",
CountryOfOperations: "GB",
CountryOfRiskUUID: "GB_UUID",
CountryOfIncorporationUUID: "IM_UUID",
CountryOfOperationsUUID: "GB_UUID",
PostalCode: "IM9 2RG",
YearFounded: 1951,
EmailAddress: "info@strix.com",
LeiCode: "213800KZEW5W6BZMNT62",
ParentOrganisation: "123",
},
},
"99247059-04ec-3abb-8693-a0b8951fdcab": {
Expand Down
27 changes: 16 additions & 11 deletions s3/model.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,22 @@ type Concept struct {
PersonUUID string `json:"personUUID,omitempty"`
TerminationDate string `json:"terminationDate,omitempty"`
// Organisation
CountryCode string `json:"countryCode,omitempty"`
CountryOfIncorporation string `json:"countryOfIncorporation,omitempty"`
FormerNames []string `json:"formerNames,omitempty"`
TradeNames []string `json:"tradeNames,omitempty"`
LeiCode string `json:"leiCode,omitempty"`
ParentOrganisation string `json:"parentOrganisation,omitempty"`
PostalCode string `json:"postalCode,omitempty"`
ProperName string `json:"properName,omitempty"`
ShortName string `json:"shortName,omitempty"`
YearFounded int `json:"yearFounded,omitempty"`
IsDeprecated bool `json:"isDeprecated,omitempty"`
CountryCode string `json:"countryCode,omitempty"`
CountryOfRisk string `json:"countryOfRisk,omitempty"`
CountryOfIncorporation string `json:"countryOfIncorporation,omitempty"`
CountryOfOperations string `json:"countryOfOperations,omitempty"`
CountryOfRiskUUID string `json:"countryOfRiskUUID,omitempty"`
CountryOfIncorporationUUID string `json:"countryOfIncorporationUUID,omitempty"`
CountryOfOperationsUUID string `json:"countryOfOperationsUUID,omitempty"`
FormerNames []string `json:"formerNames,omitempty"`
TradeNames []string `json:"tradeNames,omitempty"`
LeiCode string `json:"leiCode,omitempty"`
ParentOrganisation string `json:"parentOrganisation,omitempty"`
PostalCode string `json:"postalCode,omitempty"`
ProperName string `json:"properName,omitempty"`
ShortName string `json:"shortName,omitempty"`
YearFounded int `json:"yearFounded,omitempty"`
IsDeprecated bool `json:"isDeprecated,omitempty"`
// Location
ISO31661 string `json:"iso31661,omitempty"`
}

0 comments on commit 44b1917

Please sign in to comment.