feat: added operator to ms and icon in mfe api (#38)

onecx · Feb 22, 2024 · fe8814a · fe8814a
1 parent 2a06819
commit fe8814a
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 7 deletions.
diff --git a/src/main/java/org/tkit/onecx/product/store/domain/models/Microservice.java b/src/main/java/org/tkit/onecx/product/store/domain/models/Microservice.java
@@ -36,4 +36,7 @@ public class Microservice extends TraceableEntity {
     @Column(name = "PRODUCT_NAME")
     private String productName;
 
+    @Column(name = "OPERATOR", nullable = false)
+    private boolean operator;
+
 }
diff --git a/src/main/java/org/tkit/onecx/product/store/rs/internal/mappers/MicroserviceMapper.java b/src/main/java/org/tkit/onecx/product/store/rs/internal/mappers/MicroserviceMapper.java
@@ -19,6 +19,7 @@ public interface MicroserviceMapper {
     @Mapping(target = "creationUser", ignore = true)
     @Mapping(target = "creationDate", ignore = true)
     @Mapping(target = "controlTraceabilityManual", ignore = true)
+    @Mapping(target = "operator", constant = "false")
     Microservice create(CreateMicroserviceRequestDTO dto);
 
     @Mapping(target = "persisted", ignore = true)
@@ -29,6 +30,7 @@ public interface MicroserviceMapper {
     @Mapping(target = "creationUser", ignore = true)
     @Mapping(target = "creationDate", ignore = true)
     @Mapping(target = "controlTraceabilityManual", ignore = true)
+    @Mapping(target = "operator", constant = "false")
     void update(UpdateMicroserviceRequestDTO dto, @MappingTarget Microservice data);
 
     MicroserviceSearchCriteria map(MicroserviceSearchCriteriaDTO dto);

diff --git a/src/main/java/org/tkit/onecx/product/store/rs/operator/ms/v1/mappers/OperatorMsMapperV1.java b/src/main/java/org/tkit/onecx/product/store/rs/operator/ms/v1/mappers/OperatorMsMapperV1.java
@@ -20,6 +20,7 @@ public interface OperatorMsMapperV1 {
     @Mapping(target = "creationUser", ignore = true)
     @Mapping(target = "creationDate", ignore = true)
     @Mapping(target = "controlTraceabilityManual", ignore = true)
+    @Mapping(target = "operator", constant = "true")
     @Mapping(target = "appId", ignore = true)
     Microservice create(UpdateMsRequestMsDTOv1 dto);
 
@@ -32,6 +33,7 @@ public interface OperatorMsMapperV1 {
     @Mapping(target = "creationUser", ignore = true)
     @Mapping(target = "creationDate", ignore = true)
     @Mapping(target = "controlTraceabilityManual", ignore = true)
+    @Mapping(target = "operator", constant = "true")
     @Mapping(target = "appId", ignore = true)
     void update(@MappingTarget Microservice ms, UpdateMsRequestMsDTOv1 dto);
 }
diff --git a/src/main/openapi/onecx-product-store-internal.yaml b/src/main/openapi/onecx-product-store-internal.yaml
@@ -692,6 +692,8 @@ components:
           type: string
         description:
           type: string
+        iconName:
+          type: string
         technology:
           type: string
         remoteBaseUrl:
@@ -741,6 +743,8 @@ components:
           type: string
         productName:
           type: string
+        operator:
+          type: boolean
     MicrofrontendSearchCriteria:
       type: object
       properties:
@@ -1005,6 +1009,8 @@ components:
           type: string
         productName:
           type: string
+        operator:
+          type: boolean
     UIEndpoint:
       required:
         - path

diff --git a/src/main/resources/db/changeLog.xml b/src/main/resources/db/changeLog.xml
@@ -7,4 +7,5 @@
         <include relativeToChangelogFile="true" file="v1/2024-02-01-mfe-attrs.xml"/>
         <include relativeToChangelogFile="true" file="v1/2023-12-07-create-tables-image.xml"/>
         <include relativeToChangelogFile="true" file="v1/2024-02-19-create-ms-table.xml"/>
+        <include relativeToChangelogFile="true" file="v1/2024-02-22-ms-operator-field.xml"/>
 </databaseChangeLog>
diff --git a/src/main/resources/db/v1/2024-02-22-ms-operator-field.xml b/src/main/resources/db/v1/2024-02-22-ms-operator-field.xml
@@ -0,0 +1,15 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog
+        xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd"
+        objectQuotingStrategy="QUOTE_ONLY_RESERVED_WORDS">
+
+    <changeSet author="dev (generated)" id="1706808517706-9">
+        <addColumn tableName="microservice">
+            <column name="operator" type="BOOLEAN">
+                <constraints nullable="false"/>
+            </column>
+        </addColumn>
+    </changeSet>
+</databaseChangeLog>
diff --git a/src/test/resources/data/test-internal.xml b/src/test/resources/data/test-internal.xml
@@ -15,9 +15,9 @@
                       operator="false" optlock="0" app_version="1.0.0" contact="[email protected]" description="some text" icon_name="sun" note="some notes" technology="Angular" creationDate="2024-01-11 12:21:38.914993" modificationDate="2024-01-11 12:21:38.914993"
                       classification="searching"/>
 
-    <MICROSERVICE guid="m1" app_id="ms1" product_name="product1" name="coolname" optlock="0" version="1.0.0"/>
-    <MICROSERVICE guid="m2" app_id="ms2" product_name="product2" optlock="0"/>
-    <MICROSERVICE guid="ms1" app_id="msOne" product_name="productOne" name="displayname-1" optlock="0" version="1.0.0" description="some text" creationDate="2024-01-11 12:21:38.914993" modificationDate="2024-01-11 12:21:38.914993" />
+    <MICROSERVICE guid="m1" app_id="ms1" product_name="product1" name="coolname" optlock="0" version="1.0.0" operator="false"/>
+    <MICROSERVICE guid="m2" app_id="ms2" product_name="product2" optlock="0" operator="false"/>
+    <MICROSERVICE guid="ms1" app_id="msOne" product_name="productOne" name="displayname-1" optlock="0" version="1.0.0" description="some text" creationDate="2024-01-11 12:21:38.914993" modificationDate="2024-01-11 12:21:38.914993" operator="false"/>
 
     <UI_ENDPOINT guid="ui1" microfrontend_id="m1" name="e1" path="p1" />
     <UI_ENDPOINT guid="ui2" microfrontend_id="m1" name="e2" path="p2" />

diff --git a/src/test/resources/data/test-operator-ms.xml b/src/test/resources/data/test-operator-ms.xml
@@ -3,8 +3,8 @@
 
     <MICROSERVICE guid="m1" app_id="ms1" product_name="p1" name="display_name1" optlock="0"
                    version="1.0.0" description="some text" creationDate="2024-01-11 12:21:38.914993" modificationDate="2024-01-11 12:21:38.914993"
-                   />
+                  operator="false"/>
 
     <MICROSERVICE guid="m2" app_id="ms2" product_name="p2" name="display_name2" optlock="0" version="1.0.0" description="some text" creationDate="2024-01-11 12:21:38.914993" modificationDate="2024-01-11 12:21:38.914993"
-                   />
+                  operator="false"/>
 </dataset>
diff --git a/src/test/resources/data/test-v1.xml b/src/test/resources/data/test-v1.xml
@@ -6,8 +6,8 @@
     <MICROFRONTEND guid="m1" app_id="mfe1" product_name="product1" remote_entry="remote-entry1" exposed_module="exposed-module1" app_name="display_name1" remote_base_url="remote_base_url1" operator="false" optlock="0"/>
     <MICROFRONTEND guid="m2" app_id="mfe2" product_name="product1" remote_entry="remote-entry2" exposed_module="exposed-module2" app_name="display_name2" remote_base_url="remote_base_url2" operator="false" optlock="0"/>
 
-    <MICROSERVICE guid="m1" app_id="mfe1" product_name="product1" optlock="0"/>
-    <MICROSERVICE guid="m2" app_id="mfe2" product_name="product1" optlock="0"/>
+    <MICROSERVICE guid="m1" app_id="mfe1" product_name="product1" optlock="0" operator="false"/>
+    <MICROSERVICE guid="m2" app_id="mfe2" product_name="product1" optlock="0" operator="false"/>
 
     <UI_ENDPOINT guid="ui1" microfrontend_id="m1" name="e1" path="p1" />
     <UI_ENDPOINT guid="ui2" microfrontend_id="m1" name="e2" path="p2" />