Fixed small user changes

COS301-SE-2023 · Oct 20, 2023 · ba34388 · ba34388
1 parent d731e9a
commit ba34388
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 9 deletions.
diff --git a/...safe_backend/src/main/java/com/fragile/infosafe/primary/service/AccessRequestService.java b/...safe_backend/src/main/java/com/fragile/infosafe/primary/service/AccessRequestService.java
@@ -48,8 +48,13 @@ public ResponseEntity<String> makeAR(AccessRequestRequest request, User authenti
     public List<AccessRequest> getAllAccessRequests() {
         List<AccessRequest> ar = accessRequestRepository.findAll();
         for(AccessRequest accessRequest : ar){
-            accessRequest.getUser_id().setFirst_name(encryptionService.decryptString(accessRequest.getUser_id().getFirst_name()));
-            accessRequest.getUser_id().setLast_name(encryptionService.decryptString(accessRequest.getUser_id().getLast_name()));
+            User currentAssignee = accessRequest.getUser_id();
+            User decryptedCurrentAssignee = new User();
+            decryptedCurrentAssignee.setUser_id(currentAssignee.getUser_id());
+            decryptedCurrentAssignee.setFirst_name(encryptionService.decryptString(currentAssignee.getFirst_name()));
+            decryptedCurrentAssignee.setLast_name(encryptionService.decryptString(currentAssignee.getLast_name()));
+            decryptedCurrentAssignee.setRole(currentAssignee.getRole());
+            accessRequest.setUser_id(currentAssignee);
         }
         return ar;
     }
@@ -82,7 +87,7 @@ public ResponseEntity<String> reviewAccessRequest(ReviewRequest reviewRequest) {
             }
         } else {
             deleteService.deleteAccessRequestAndSaveToSecondary(reviewRequest.getRequest_id());
-            emailUser(reviewRequest.getUser_email(), "", "Denied");
+            emailUser(encryptionService.decryptString(reviewRequest.getUser_email()), "", "Denied");
             String message = "rejected access";
             return ResponseEntity.ok(message);
         }

diff --git a/...osafe_backend/src/main/java/com/fragile/infosafe/primary/service/AssetRequestService.java b/...osafe_backend/src/main/java/com/fragile/infosafe/primary/service/AssetRequestService.java
@@ -58,8 +58,13 @@ public ResponseEntity<String> makeAR(AssetRequestRequest request, User authentic
     public List<AssetRequests> getAllAssetRequests() {
         List<AssetRequests> ar = assetRequestRepository.findAll();
         for (AssetRequests assetRequests : ar) {
-            assetRequests.getUser().setFirst_name(encryptionService.decryptString(assetRequests.getUser().getFirst_name()));
-            assetRequests.getUser().setLast_name(encryptionService.decryptString(assetRequests.getUser().getLast_name()));
+            User currentAssignee = assetRequests.getUser();
+            User decryptedCurrentAssignee = new User();
+            decryptedCurrentAssignee.setUser_id(currentAssignee.getUser_id());
+            decryptedCurrentAssignee.setFirst_name(encryptionService.decryptString(currentAssignee.getFirst_name()));
+            decryptedCurrentAssignee.setLast_name(encryptionService.decryptString(currentAssignee.getLast_name()));
+            decryptedCurrentAssignee.setRole(currentAssignee.getRole());
+            assetRequests.setUser(currentAssignee);
         }
         return ar;
     }

diff --git a/...afe_backend/src/main/java/com/fragile/infosafe/primary/service/SupportRequestService.java b/...afe_backend/src/main/java/com/fragile/infosafe/primary/service/SupportRequestService.java
@@ -66,8 +66,13 @@ public ResponseEntity<String> makeSR(SupportRequestRequest request, User authent
     public List<SupportRequest> getAllSupportRequests() {
         List<SupportRequest> sr = supportRequestRepository.findAll();
         for(SupportRequest supportRequest : sr){
-            supportRequest.getUser_id().setFirst_name(encryptionService.decryptString(supportRequest.getUser_id().getFirst_name()));
-            supportRequest.getUser_id().setLast_name(encryptionService.decryptString(supportRequest.getUser_id().getLast_name()));
+            User currentAssignee = supportRequest.getUser_id();
+            User decryptedCurrentAssignee = new User();
+            decryptedCurrentAssignee.setUser_id(currentAssignee.getUser_id());
+            decryptedCurrentAssignee.setFirst_name(encryptionService.decryptString(currentAssignee.getFirst_name()));
+            decryptedCurrentAssignee.setLast_name(encryptionService.decryptString(currentAssignee.getLast_name()));
+            decryptedCurrentAssignee.setRole(currentAssignee.getRole());
+            supportRequest.setUser_id(currentAssignee);
         }
         return sr;
     }
@@ -107,8 +112,13 @@ public SupportRequest updateSupportRequest(SupportRequestRequest supportRequest)
     public List<SupportRequest> getUserSupportRequests(int user_id) {
         List<SupportRequest> sr = supportRequestRepository.findAllByUserId(user_id);
         for(SupportRequest supportRequest : sr){
-            supportRequest.getUser_id().setFirst_name(encryptionService.decryptString(supportRequest.getUser_id().getFirst_name()));
-            supportRequest.getUser_id().setLast_name(encryptionService.decryptString(supportRequest.getUser_id().getLast_name()));
+            User currentAssignee = supportRequest.getUser_id();
+            User decryptedCurrentAssignee = new User();
+            decryptedCurrentAssignee.setUser_id(currentAssignee.getUser_id());
+            decryptedCurrentAssignee.setFirst_name(encryptionService.decryptString(currentAssignee.getFirst_name()));
+            decryptedCurrentAssignee.setLast_name(encryptionService.decryptString(currentAssignee.getLast_name()));
+            decryptedCurrentAssignee.setRole(currentAssignee.getRole());
+            supportRequest.setUser_id(currentAssignee);
         }
         return sr;
     }