Merge pull request #168 from cardano-foundation/chore/split_organisat…

…ion_endpoint

chore: split organisation endpoint in create and update

accounting_reporting_core/src/test/java/org/cardanofoundation/lob/app/accounting_reporting_core/service/internal/AccountingCoreEventHandlerDuplicateEventsTest.java

@@ -71,7 +71,7 @@ class AccountingCoreEventHandlerDuplicateEventsTest {
     private TransactionReconcilationRepository transactionReconcilationRepository;
 
     @BeforeEach
-    public void clearDatabase(@Autowired Flyway flyway){
+    void clearDatabase(@Autowired Flyway flyway){
         flyway.clean();
         flyway.migrate();
     }

organisation/build.gradle.kts

@@ -1,7 +1,3 @@
-plugins {
-    id("org.sonarqube")
-}
-
 dependencies {
 
     implementation("org.springframework.modulith:spring-modulith-api")

organisation/src/main/java/org/cardanofoundation/lob/app/organisation/domain/entity/Organisation.java

@@ -46,9 +46,6 @@ public class Organisation extends CommonEntity implements Persistable<String> {
     @Column(name = "province", nullable = false)
     private String province;
 
-    @Column(name = "country", nullable = false)
-    private String country;
-
     @Column(name = "address", nullable = false)
     private String address;
 

organisation/src/main/java/org/cardanofoundation/lob/app/organisation/domain/request/OrganisationUpsert.java → organisation/src/main/java/org/cardanofoundation/lob/app/organisation/domain/request/OrganisationCreate.java

@@ -11,7 +11,7 @@
 @Setter
 @AllArgsConstructor
 @NoArgsConstructor
-public class OrganisationUpsert {
+public class OrganisationCreate {
 
     @Schema(example = "My company name")
     private String name;
@@ -25,9 +25,6 @@ public class OrganisationUpsert {
     @Schema(example = "Co. Wexford")
     private String province;
 
-    @Schema(example = "Ireland")
-    private String country;
-
     @Schema(example = "IE")
     private String countryCode;
 

organisation/src/main/java/org/cardanofoundation/lob/app/organisation/domain/request/OrganisationUpdate.java

@@ -0,0 +1,46 @@
+package org.cardanofoundation.lob.app.organisation.domain.request;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+public class OrganisationUpdate {
+
+    @Schema(example = "My company name")
+    private String name;
+
+    @Schema(example = "Ballyhealy")
+    private String city;
+
+    @Schema(example = "Y35 C6KC")
+    private String postCode;
+
+    @Schema(example = "Co. Wexford")
+    private String province;
+
+    @Schema(example = "Ballyhealy Cottage")
+    private String address;
+
+    @Schema(example = "0035863286566")
+    private String phoneNumber;
+
+    @Schema(example = "[email protected]")
+    private String adminEmail;
+
+    @Schema(example = "http://cardanofoundation.org")
+    private String websiteUrl;
+
+    @Schema(example = "ISO_4217:CHF")
+    private String currencyId;
+
+    @Schema(example = "ISO_4217:CHF")
+    private String reportCurrencyId;
+
+}