diff --git a/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/SwaggerDefinitionsJSON.scala b/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/SwaggerDefinitionsJSON.scala index 5914c12b4..84ce088ae 100644 --- a/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/SwaggerDefinitionsJSON.scala +++ b/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/SwaggerDefinitionsJSON.scala @@ -57,6 +57,7 @@ object SwaggerDefinitionsJSON { entity_id = "0af807d7-3c39-43ef-9712-82bcfde1b9ca", certificate_authority_ca_owner_id = "CY_CBC", entity_certificate_public_key = "-----BEGIN CERTIFICATE-----MIICsjCCAZqgAwIBAgIGAYwQ62R0MA0GCSqGSIb3DQEBCwUAMBoxGDAWBgNVBAMMD2FwcC5leGFtcGxlLmNvbTAeFw0yMzExMjcxMzE1MTFaFw0yNTExMjYxMzE1MTFaMBoxGDAWBgNVBAMMD2FwcC5leGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK9WIodZHWzKyCcf9YfWEhPURbfO6zKuMqzHN27GdqHsVVEGxP4F/J4mso+0ENcRr6ur4u81iREaVdCc40rHDHVJNEtniD8Icbz7tcsqAewIVhc/q6WXGqImJpCq7hA0m247dDsaZT0lb/MVBiMoJxDEmAE/GYYnWTEn84R35WhJsMvuQ7QmLvNg6RkChY6POCT/YKe9NKwa1NqI1U+oA5RFzAaFtytvZCE3jtp+aR0brL7qaGfgxm6B7dEpGyhg0NcVCV7xMQNq2JxZTVdAr6lcsRGaAFulakmW3aNnmK+L35Wu8uW+OxNxwUuC6f3b4FVBa276FMuUTRfu7gc+k6kCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAAU5CjEyAoyTn7PgFpQD48ZNPuUsEQ19gzYgJvHMzFIoZ7jKBodjO5mCzWBcR7A4mpeAsdyiNBl2sTiZscSnNqxk61jVzP5Ba1D7XtOjjr7+3iqowrThj6BY40QqhYh/6BSY9fDzVZQiHnvlo6ZUM5kUK6OavZOovKlp5DIl5sGqoP0qAJnpQ4nhB2WVVsKfPlOXc+2KSsbJ23g9l8zaTMr+X0umlvfEKqyEl1Fa2L1dO0y/KFQ+ILmxcZLpRdq1hRAjd0quq9qGC8ucXhRWDgM4hslVpau0da68g0aItWNez3mc5lB82b3dcZpFMzO41bgw7gvw10AvvTfQDqEYIuQ==-----END CERTIFICATE-----", + entity_name = "EXAMPLE COMPANY LTD", entity_code = "PSD_PICY_CBC!12345", entity_type = "PSD_PI", entity_address = "EXAMPLE COMPANY LTD, 5 SOME STREET", @@ -70,6 +71,7 @@ object SwaggerDefinitionsJSON { lazy val regulatedEntityPostJsonV510: RegulatedEntityPostJsonV510 = RegulatedEntityPostJsonV510( certificate_authority_ca_owner_id = "CY_CBC", entity_certificate_public_key = "-----BEGIN CERTIFICATE-----MIICsjCCAZqgAwIBAgIGAYwQ62R0MA0GCSqGSIb3DQEBCwUAMBoxGDAWBgNVBAMMD2FwcC5leGFtcGxlLmNvbTAeFw0yMzExMjcxMzE1MTFaFw0yNTExMjYxMzE1MTFaMBoxGDAWBgNVBAMMD2FwcC5leGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK9WIodZHWzKyCcf9YfWEhPURbfO6zKuMqzHN27GdqHsVVEGxP4F/J4mso+0ENcRr6ur4u81iREaVdCc40rHDHVJNEtniD8Icbz7tcsqAewIVhc/q6WXGqImJpCq7hA0m247dDsaZT0lb/MVBiMoJxDEmAE/GYYnWTEn84R35WhJsMvuQ7QmLvNg6RkChY6POCT/YKe9NKwa1NqI1U+oA5RFzAaFtytvZCE3jtp+aR0brL7qaGfgxm6B7dEpGyhg0NcVCV7xMQNq2JxZTVdAr6lcsRGaAFulakmW3aNnmK+L35Wu8uW+OxNxwUuC6f3b4FVBa276FMuUTRfu7gc+k6kCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAAU5CjEyAoyTn7PgFpQD48ZNPuUsEQ19gzYgJvHMzFIoZ7jKBodjO5mCzWBcR7A4mpeAsdyiNBl2sTiZscSnNqxk61jVzP5Ba1D7XtOjjr7+3iqowrThj6BY40QqhYh/6BSY9fDzVZQiHnvlo6ZUM5kUK6OavZOovKlp5DIl5sGqoP0qAJnpQ4nhB2WVVsKfPlOXc+2KSsbJ23g9l8zaTMr+X0umlvfEKqyEl1Fa2L1dO0y/KFQ+ILmxcZLpRdq1hRAjd0quq9qGC8ucXhRWDgM4hslVpau0da68g0aItWNez3mc5lB82b3dcZpFMzO41bgw7gvw10AvvTfQDqEYIuQ==-----END CERTIFICATE-----", + entity_name = "EXAMPLE COMPANY LTD", entity_code = "PSD_PICY_CBC!12345", entity_type = "PSD_PI", entity_address = "EXAMPLE COMPANY LTD, 5 SOME STREET", diff --git a/obp-api/src/main/scala/code/api/util/newstyle/RegulatedEntity.scala b/obp-api/src/main/scala/code/api/util/newstyle/RegulatedEntity.scala index c4d79bbd2..58f5f11bd 100644 --- a/obp-api/src/main/scala/code/api/util/newstyle/RegulatedEntity.scala +++ b/obp-api/src/main/scala/code/api/util/newstyle/RegulatedEntity.scala @@ -17,6 +17,7 @@ object RegulatedEntityNewStyle { def createRegulatedEntityNewStyle(certificateAuthorityCaOwnerId: Option[String], entityCertificatePublicKey: Option[String], + entityName: Option[String], entityCode: Option[String], entityType: Option[String], entityAddress: Option[String], @@ -30,6 +31,7 @@ object RegulatedEntityNewStyle { MappedRegulatedEntityProvider.createRegulatedEntity( certificateAuthorityCaOwnerId: Option[String], entityCertificatePublicKey: Option[String], + entityName: Option[String], entityCode: Option[String], entityType: Option[String], entityAddress: Option[String], diff --git a/obp-api/src/main/scala/code/api/v5_1_0/APIMethods510.scala b/obp-api/src/main/scala/code/api/v5_1_0/APIMethods510.scala index 1ef1b831c..06677998b 100644 --- a/obp-api/src/main/scala/code/api/v5_1_0/APIMethods510.scala +++ b/obp-api/src/main/scala/code/api/v5_1_0/APIMethods510.scala @@ -218,6 +218,7 @@ trait APIMethods510 { (entity, callContext) <- createRegulatedEntityNewStyle( certificateAuthorityCaOwnerId = Some(postedData.certificate_authority_ca_owner_id), entityCertificatePublicKey = Some(postedData.entity_certificate_public_key), + entityName = Some(postedData.entity_name), entityCode = Some(postedData.entity_code), entityType = Some(postedData.entity_type), entityAddress = Some(postedData.entity_address), diff --git a/obp-api/src/main/scala/code/api/v5_1_0/JSONFactory5.1.0.scala b/obp-api/src/main/scala/code/api/v5_1_0/JSONFactory5.1.0.scala index 6ff9d348e..735b4fe75 100644 --- a/obp-api/src/main/scala/code/api/v5_1_0/JSONFactory5.1.0.scala +++ b/obp-api/src/main/scala/code/api/v5_1_0/JSONFactory5.1.0.scala @@ -72,6 +72,7 @@ case class RegulatedEntityJsonV510( entity_id: String, certificate_authority_ca_owner_id: String, entity_certificate_public_key: String, + entity_name: String, entity_code: String, entity_type: String, entity_address: String, @@ -84,6 +85,7 @@ case class RegulatedEntityJsonV510( case class RegulatedEntityPostJsonV510( certificate_authority_ca_owner_id: String, entity_certificate_public_key: String, + entity_name: String, entity_code: String, entity_type: String, entity_address: String, @@ -594,6 +596,7 @@ object JSONFactory510 extends CustomJsonFormats { entity_id = entity.entityId, certificate_authority_ca_owner_id = entity.certificateAuthorityCaOwnerId, entity_certificate_public_key = entity.entityCertificatePublicKey, + entity_name = entity.entityName, entity_code = entity.entityCode, entity_type = entity.entityType, entity_address = entity.entityAddress, diff --git a/obp-api/src/main/scala/code/regulatedentities/MappedRegulatedEntitiyProvider.scala b/obp-api/src/main/scala/code/regulatedentities/MappedRegulatedEntitiyProvider.scala index b1295e0f5..e84a6d042 100644 --- a/obp-api/src/main/scala/code/regulatedentities/MappedRegulatedEntitiyProvider.scala +++ b/obp-api/src/main/scala/code/regulatedentities/MappedRegulatedEntitiyProvider.scala @@ -19,6 +19,7 @@ object MappedRegulatedEntityProvider extends RegulatedEntityProvider { override def createRegulatedEntity(certificateAuthorityCaOwnerId: Option[String], entityCertificatePublicKey: Option[String], + entityName: Option[String], entityCode: Option[String], entityType: Option[String], entityAddress: Option[String], @@ -38,6 +39,10 @@ object MappedRegulatedEntityProvider extends RegulatedEntityProvider { case Some(v) => entity.EntityCertificatePublicKey(v) case None => } + entityName match { + case Some(v) => entity.EntityName(v) + case None => + } entityCode match { case Some(v) => entity.EntityCode(v) case None => @@ -90,20 +95,22 @@ object MappedRegulatedEntityProvider extends RegulatedEntityProvider { class MappedRegulatedEntity extends RegulatedEntityTrait with LongKeyedMapper[MappedRegulatedEntity] with IdPK { override def getSingleton = MappedRegulatedEntity object EntityId extends MappedUUID(this) - object CertificateAuthorityCaOwnerId extends MappedString(this, 50) + object CertificateAuthorityCaOwnerId extends MappedString(this, 256) + object EntityName extends MappedString(this, 256) object EntityCode extends MappedString(this, 50) object EntityCertificatePublicKey extends MappedText(this) object EntityType extends MappedString(this, 50) - object EntityAddress extends MappedString(this, 50) + object EntityAddress extends MappedString(this, 256) object EntityTownCity extends MappedString(this, 50) object EntityPostCode extends MappedString(this, 50) object EntityCountry extends MappedString(this, 50) - object EntityWebSite extends MappedString(this, 50) + object EntityWebSite extends MappedString(this, 256) object Services extends MappedText(this) override def entityId: String = EntityId.get override def certificateAuthorityCaOwnerId: String = CertificateAuthorityCaOwnerId.get + override def entityName: String = EntityName.get override def entityCode: String = EntityCode.get override def entityCertificatePublicKey: String = EntityCertificatePublicKey.get override def entityType: String = EntityType.get diff --git a/obp-api/src/main/scala/code/regulatedentities/RegulatedEntity.scala b/obp-api/src/main/scala/code/regulatedentities/RegulatedEntity.scala index 25af53275..2a73a3e41 100644 --- a/obp-api/src/main/scala/code/regulatedentities/RegulatedEntity.scala +++ b/obp-api/src/main/scala/code/regulatedentities/RegulatedEntity.scala @@ -20,6 +20,7 @@ trait RegulatedEntityProvider { def createRegulatedEntity(certificateAuthorityCaOwnerId: Option[String], entityCertificatePublicKey: Option[String], + entityName: Option[String], entityCode: Option[String], entityType: Option[String], entityAddress: Option[String], diff --git a/obp-commons/src/main/scala/com/openbankproject/commons/model/CommonModelTrait.scala b/obp-commons/src/main/scala/com/openbankproject/commons/model/CommonModelTrait.scala index 54c4cac53..7707a607b 100644 --- a/obp-commons/src/main/scala/com/openbankproject/commons/model/CommonModelTrait.scala +++ b/obp-commons/src/main/scala/com/openbankproject/commons/model/CommonModelTrait.scala @@ -100,6 +100,7 @@ trait AccountApplication { trait RegulatedEntityTrait { def entityId: String def certificateAuthorityCaOwnerId: String + def entityName: String def entityCode: String def entityCertificatePublicKey: String def entityType: String