feat: add assignment operator attribute

onecx · May 28, 2024 · 229974f · 229974f
1 parent 73955ab
commit 229974f
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 0 deletions.
diff --git a/src/main/java/org/tkit/onecx/permission/domain/di/mappers/TemplateMapper.java b/src/main/java/org/tkit/onecx/permission/domain/di/mappers/TemplateMapper.java
@@ -56,5 +56,6 @@ public interface TemplateMapper {
     @Mapping(target = "roleId", ignore = true)
     @Mapping(target = "permissionId", ignore = true)
     @Mapping(target = "tenantId", ignore = true)
+    @Mapping(target = "operator", ignore = true)
     Assignment createAssignment(Role role, Permission permission);
 }
diff --git a/src/main/java/org/tkit/onecx/permission/domain/models/Assignment.java b/src/main/java/org/tkit/onecx/permission/domain/models/Assignment.java
@@ -35,6 +35,12 @@ public class Assignment extends TraceableEntity {
     @JoinColumn(name = "PERMISSION_ID")
     private Permission permission;
 
+    /**
+     * Flag to identify permissions created by an operator
+     */
+    @Column(name = "OPERATOR")
+    private Boolean operator;
+
     /**
      * Flag to protect mandatory data
      */

diff --git a/src/main/java/org/tkit/onecx/permission/rs/exim/v1/controllers/PermissionExportImportV1.java b/src/main/java/org/tkit/onecx/permission/rs/exim/v1/controllers/PermissionExportImportV1.java
@@ -93,6 +93,7 @@ public Response operatorImportAssignments(AssignmentSnapshotDTOV1 assignmentSnap
                                             .createProblem("Permission not found", "Permission ID: " + permId));
                                 } else {
                                     var assignment = mapper.create(role, permission);
+                                    assignment.setOperator(true);
                                     assignments.add(assignment);
                                 }
                             }));

diff --git a/src/main/java/org/tkit/onecx/permission/rs/exim/v1/mappers/EximMapperV1.java b/src/main/java/org/tkit/onecx/permission/rs/exim/v1/mappers/EximMapperV1.java
@@ -21,6 +21,7 @@ public interface EximMapperV1 {
     @Mapping(target = "roleId", ignore = true)
     @Mapping(target = "permissionId", ignore = true)
     @Mapping(target = "tenantId", ignore = true)
+    @Mapping(target = "operator", ignore = true)
     Assignment create(Role role, Permission permission);
 
     static String permId(Permission p) {

diff --git a/src/main/java/org/tkit/onecx/permission/rs/internal/mappers/AssignmentMapper.java b/src/main/java/org/tkit/onecx/permission/rs/internal/mappers/AssignmentMapper.java
@@ -35,6 +35,7 @@ public interface AssignmentMapper {
     @Mapping(target = "roleId", ignore = true)
     @Mapping(target = "permissionId", ignore = true)
     @Mapping(target = "mandatory", ignore = true)
+    @Mapping(target = "operator", ignore = true)
     Assignment create(Role role, Permission permission);
 
     @Mapping(target = "appId", source = "permission.appId")

diff --git a/src/main/openapi/onecx-permission-internal-openapi.yaml b/src/main/openapi/onecx-permission-internal-openapi.yaml
@@ -644,6 +644,9 @@ components:
         mandatory:
           type: boolean
           default: false
+        operator:
+          type: boolean
+          default: false
     UpdateRoleRequest:
       type: object
       required:

diff --git a/src/main/resources/db/changeLog.xml b/src/main/resources/db/changeLog.xml
@@ -8,5 +8,6 @@
     <include relativeToChangelogFile="true" file="v1/2024-04-09-constraint-and-index-fix.xml" />
     <include relativeToChangelogFile="true" file="v1/2024-05-13-mandatory-flags.xml" />
     <include relativeToChangelogFile="true" file="v1/2024-05-16-operator-flag.xml" />
+    <include relativeToChangelogFile="true" file="v1/2024-05-28-assignment-operator.xml" />
 
 </databaseChangeLog>
diff --git a/src/main/resources/db/v1/2024-05-28-assignment-operator.xml b/src/main/resources/db/v1/2024-05-28-assignment-operator.xml
@@ -0,0 +1,13 @@
+<?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="1716816363825-1">
+        <addColumn tableName="assignment">
+            <column name="operator" type="bool"/>
+        </addColumn>
+    </changeSet>
+</databaseChangeLog>