#779 | Introduce User "isIgnoreSyncSettingsInDEA" flag to allow DEA a…

…ccess to transactional entities within Catchment but not matching sync settings
avniproject · Aug 29, 2024 · 4335186 · 4335186
1 parent 2ec78cf
commit 4335186
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 0 deletions.
diff --git a/avni-server-api/src/main/java/org/avni/server/domain/User.java b/avni-server-api/src/main/java/org/avni/server/domain/User.java
@@ -101,6 +101,9 @@ public class User {
     @Type(type = "jsonObject")
     private JsonObject syncSettings;
 
+    @Column(name = "ignore_sync_settings_in_dea")
+    private boolean ignoreSyncSettingsInDEA;
+
     @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL, mappedBy = "user")
     private List<UserGroup> userGroups;
 
@@ -291,6 +294,14 @@ public void setSyncSettings(JsonObject syncSettings) {
         this.syncSettings = syncSettings;
     }
 
+    public boolean isIgnoreSyncSettingsInDEA() {
+        return ignoreSyncSettingsInDEA;
+    }
+
+    public void setIgnoreSyncSettingsInDEA(boolean ignoreSyncSettingsInDEA) {
+        this.ignoreSyncSettingsInDEA = ignoreSyncSettingsInDEA;
+    }
+
     public String[] getRoles() {
         ArrayList<String> roles = new ArrayList<>();
         if (!isAdmin()) {

diff --git a/avni-server-api/src/main/java/org/avni/server/web/UserController.java b/avni-server-api/src/main/java/org/avni/server/web/UserController.java
@@ -193,6 +193,7 @@ private User setUserAttributes(User user, UserContract userContract) {
 
         user.setOperatingIndividualScope(OperatingIndividualScope.valueOf(userContract.getOperatingIndividualScope()));
         user.setSettings(userContract.getSettings());
+        user.setIgnoreSyncSettingsInDEA(userContract.isIgnoreSyncSettingsInDEA());
         user.setSyncSettings(UserSyncSettings.fromUserSyncWebJSON(userContract.getSyncSettings(), subjectTypeRepository));
         User currentUser = userService.getCurrentUser();
         Long organisationId = null;

diff --git a/avni-server-api/src/main/java/org/avni/server/web/request/UserContract.java b/avni-server-api/src/main/java/org/avni/server/web/request/UserContract.java
@@ -22,6 +22,7 @@ public class UserContract extends ReferenceDataContract {
     private Long organisationId;
     private List<Long> accountIds;
     private boolean disabledInCognito;
+    private boolean ignoreSyncSettingsInDEA;
     private String password;
     private JsonObject syncSettings;
     private String createdBy;
@@ -40,6 +41,7 @@ public static UserContract fromEntity(User user) {
         userContract.setPhoneNumber(user.getPhoneNumber());
         userContract.setOrganisationId(user.getOrganisationId());
         userContract.setDisabledInCognito(user.isDisabledInCognito());
+        userContract.setIgnoreSyncSettingsInDEA(user.isIgnoreSyncSettingsInDEA());
         userContract.setCatchmentId(user.getCatchmentId().orElse(null));
         userContract.setSettings(user.getSettings());
         userContract.setCreatedBy(user.getCreatedByUserName());
@@ -61,6 +63,14 @@ public void setDisabledInCognito(boolean disabledInCognito) {
         this.disabledInCognito = disabledInCognito;
     }
 
+    public boolean isIgnoreSyncSettingsInDEA() {
+        return ignoreSyncSettingsInDEA;
+    }
+
+    public void setIgnoreSyncSettingsInDEA(boolean ignoreSyncSettingsInDEA) {
+        this.ignoreSyncSettingsInDEA = ignoreSyncSettingsInDEA;
+    }
+
     public Long getOrganisationId() {
         return organisationId;
     }

diff --git a/...server-api/src/main/resources/db/migration/V1_339_7__AddIgnoreSyncSettingsInDEAToUser.sql b/...server-api/src/main/resources/db/migration/V1_339_7__AddIgnoreSyncSettingsInDEAToUser.sql
@@ -0,0 +1 @@
+alter table users add column ignore_sync_settings_in_DEA boolean not null default false;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		alter table users add column ignore_sync_settings_in_DEA boolean not null default false;