Merge pull request #29 from SLUDI/main

Refactor organization users function

Author: Tishan-001

.gradle/file-system.probe

@@ -650,7 +650,7 @@
 <script type="text/javascript">
 function configurationCacheProblems() { return (
 // begin-report-data
-{"diagnostics":[{"problem":[{"text":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10."}],"contextualLabel":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated.","documentationLink":"https://docs.gradle.org/9.0.0/userguide/upgrading_version_8.html#groovy_space_assignment_syntax","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"properties-should-be-assigned-using-the-propname-value-syntax-setting-a-property-via-the-gradle-generated-propname-value-or-propname-value-syntax-in-groovy-dsl","displayName":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"solutions":[[{"text":"Use assignment ('url = <value>') instead."}]]},{"locations":[{"path":"/home/tishan/development/FYP/SLUDI-Backend/src/main/java/org/example/service/VerifiableCredentialService.java"},{"taskPath":":compileJava"}],"problem":[{"text":"/home/tishan/development/FYP/SLUDI-Backend/src/main/java/org/example/service/VerifiableCredentialService.java uses unchecked or unsafe operations."}],"severity":"ADVICE","problemDetails":[{"text":"Note: /home/tishan/development/FYP/SLUDI-Backend/src/main/java/org/example/service/VerifiableCredentialService.java uses unchecked or unsafe operations."}],"contextualLabel":"/home/tishan/development/FYP/SLUDI-Backend/src/main/java/org/example/service/VerifiableCredentialService.java uses unchecked or unsafe operations.","problemId":[{"name":"java","displayName":"Java compilation"},{"name":"compilation","displayName":"Compilation"},{"name":"compiler.note.unchecked.filename","displayName":"/home/tishan/development/FYP/SLUDI-Backend/src/main/java/org/example/service/VerifiableCredentialService.java uses unchecked or unsafe operations."}]},{"locations":[{"path":"/home/tishan/development/FYP/SLUDI-Backend/src/main/java/org/example/service/VerifiableCredentialService.java"},{"taskPath":":compileJava"}],"problem":[{"text":"Recompile with -Xlint:unchecked for details."}],"severity":"ADVICE","problemDetails":[{"text":"Note: Recompile with -Xlint:unchecked for details."}],"contextualLabel":"Recompile with -Xlint:unchecked for details.","problemId":[{"name":"java","displayName":"Java compilation"},{"name":"compilation","displayName":"Compilation"},{"name":"compiler.note.unchecked.recompile","displayName":"Recompile with -Xlint:unchecked for details."}]}],"problemsReport":{"totalProblemCount":3,"buildName":"SLUDI-Backend","requestedTasks":":org.example.SLUDIBackendApplication.main()","documentationLink":"https://docs.gradle.org/9.0.0/userguide/reporting_problems.html","documentationLinkCaption":"Problem report","summaries":[]}}
+{"diagnostics":[{"problem":[{"text":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10."}],"contextualLabel":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated.","documentationLink":"https://docs.gradle.org/9.0.0/userguide/upgrading_version_8.html#groovy_space_assignment_syntax","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"properties-should-be-assigned-using-the-propname-value-syntax-setting-a-property-via-the-gradle-generated-propname-value-or-propname-value-syntax-in-groovy-dsl","displayName":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"solutions":[[{"text":"Use assignment ('url = <value>') instead."}]]},{"locations":[{"path":"/home/tishan/development/FYP/SLUDI-Backend/src/main/java/org/example/service/FingerprintService.java"},{"taskPath":":compileJava"}],"problem":[{"text":"Some input files use or override a deprecated API."}],"severity":"ADVICE","problemDetails":[{"text":"Note: Some input files use or override a deprecated API."}],"contextualLabel":"Some input files use or override a deprecated API.","problemId":[{"name":"java","displayName":"Java compilation"},{"name":"compilation","displayName":"Compilation"},{"name":"compiler.note.deprecated.plural","displayName":"Some input files use or override a deprecated API."}]},{"locations":[{"path":"/home/tishan/development/FYP/SLUDI-Backend/src/main/java/org/example/service/FingerprintService.java"},{"taskPath":":compileJava"}],"problem":[{"text":"Recompile with -Xlint:deprecation for details."}],"severity":"ADVICE","problemDetails":[{"text":"Note: Recompile with -Xlint:deprecation for details."}],"contextualLabel":"Recompile with -Xlint:deprecation for details.","problemId":[{"name":"java","displayName":"Java compilation"},{"name":"compilation","displayName":"Compilation"},{"name":"compiler.note.deprecated.recompile","displayName":"Recompile with -Xlint:deprecation for details."}]},{"locations":[{"path":"/home/tishan/development/FYP/SLUDI-Backend/src/main/java/org/example/service/HyperledgerService.java"},{"taskPath":":compileJava"}],"problem":[{"text":"Some input files use unchecked or unsafe operations."}],"severity":"ADVICE","problemDetails":[{"text":"Note: Some input files use unchecked or unsafe operations."}],"contextualLabel":"Some input files use unchecked or unsafe operations.","problemId":[{"name":"java","displayName":"Java compilation"},{"name":"compilation","displayName":"Compilation"},{"name":"compiler.note.unchecked.plural","displayName":"Some input files use unchecked or unsafe operations."}]},{"locations":[{"path":"/home/tishan/development/FYP/SLUDI-Backend/src/main/java/org/example/service/HyperledgerService.java"},{"taskPath":":compileJava"}],"problem":[{"text":"Recompile with -Xlint:unchecked for details."}],"severity":"ADVICE","problemDetails":[{"text":"Note: Recompile with -Xlint:unchecked for details."}],"contextualLabel":"Recompile with -Xlint:unchecked for details.","problemId":[{"name":"java","displayName":"Java compilation"},{"name":"compilation","displayName":"Compilation"},{"name":"compiler.note.unchecked.recompile","displayName":"Recompile with -Xlint:unchecked for details."}]}],"problemsReport":{"totalProblemCount":5,"buildName":"SLUDI-Backend","requestedTasks":":classes :testClasses","documentationLink":"https://docs.gradle.org/9.0.0/userguide/reporting_problems.html","documentationLinkCaption":"Problem report","summaries":[]}}
 // end-report-data
 );}
 </script>

build/reports/problems/problems-report.html

@@ -176,6 +176,44 @@ public ResponseEntity<ApiResponseDto<List<OrganizationUserResponseDto>>> getOrga
         }
     }
 
+    /**
+     * Get all users of an organization
+     * GET /api/organization-users/get-all
+     */
+    @GetMapping("/organization/{organizationId}")
+    @Operation(
+            security = {@SecurityRequirement(name = "bearerAuth")}
+    )
+    public ResponseEntity<ApiResponseDto<List<OrganizationUserResponseDto>>> getAllOrganizationsUsers() {
+
+        log.info("Fetching all organizations users");
+
+        try {
+            List<OrganizationUserResponseDto> users = userService.getAllOrgUsers();
+
+            ApiResponseDto<List<OrganizationUserResponseDto>> apiResponse = ApiResponseDto.<List<OrganizationUserResponseDto>>builder()
+                    .success(true)
+                    .message("Users fetched successfully")
+                    .data(users)
+                    .timestamp(Instant.now())
+                    .build();
+
+            return ResponseEntity.ok(apiResponse);
+
+        } catch (Exception ex) {
+            log.error("Error fetching users: {}", ex.getMessage(), ex);
+
+            ApiResponseDto<List<OrganizationUserResponseDto>> apiResponse = ApiResponseDto.<List<OrganizationUserResponseDto>>builder()
+                    .success(false)
+                    .message("Failed to fetch users")
+                    .errorCode("FETCH_ERROR")
+                    .timestamp(Instant.now())
+                    .build();
+
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(apiResponse);
+        }
+    }
+
     /**
      * Get user details by ID
      * GET /api/organization-users/{userId}
@@ -385,6 +423,9 @@ public ResponseEntity<ApiResponseDto<OrganizationUserResponseDto>> reactivateUse
      * GET /api/organization-users/verify-permission
      */
     @GetMapping("/verify-permission")
+    @Operation(
+            security = {@SecurityRequirement(name = "bearerAuth")}
+    )
     public ResponseEntity<ApiResponseDto<Boolean>> verifyUserPermission(
             @RequestParam String username,
             @RequestParam String permission) {
@@ -422,6 +463,9 @@ public ResponseEntity<ApiResponseDto<Boolean>> verifyUserPermission(
      * POST /api/organization-users/organization/{organizationId}/roles/initialize
      */
     @PostMapping("/organization/{organizationId}/roles/initialize")
+    @Operation(
+            security = {@SecurityRequirement(name = "bearerAuth")}
+    )
     public ResponseEntity<ApiResponseDto<List<OrganizationRole>>> initializeOrganizationRoles(
             @PathVariable Long organizationId) {
 
@@ -641,6 +685,9 @@ public ResponseEntity<ApiResponseDto<Void>> resetPassword(
      * DELETE /api/organization-users/{userId}
      */
     @DeleteMapping("/{userId}")
+    @Operation(
+            security = {@SecurityRequirement(name = "bearerAuth")}
+    )
     public ResponseEntity<ApiResponseDto<Void>> deleteUser(
             @PathVariable Long userId,
             @RequestParam Long deletedBy) {

src/main/java/org/example/controller/OrganizationUserController.java

@@ -93,7 +93,8 @@ public OrganizationResponse createOrganization (CreateOrganizationRequest reques
         // Save to database
         organization = organizationRepository.save(organization);
 
-        // Log audit trail
+        // Initialize roles
+        userService.initializeOrganizationRoles(organization.getId());
 
         log.info("Organization created successfully with ID: {} and code: {}",
                 organization.getId(), organization.getOrgCode());

src/main/java/org/example/service/OrganizationService.java

@@ -967,6 +967,14 @@ public void changePassword(String username, ChangePasswordRequestDto request) {
         log.info("Password changed successfully for user: {}", username);
     }
 
+    public List<OrganizationUserResponseDto> getAllOrgUsers() {
+        List<OrganizationUser> organizationUserList = userRepository.findAll();
+
+        return organizationUserList.stream()
+                .map(this::mapToUserResponse)
+                .collect(Collectors.toList());
+    }
+
     // Helper Methods
     /**
      * Generate unique Fabric user ID
@@ -996,6 +1004,7 @@ private OrganizationUserResponseDto mapToUserResponse(OrganizationUser user) {
                 .lastName(user.getLastName())
                 .phone(user.getPhone())
                 .organizationId(user.getOrganization().getId())
+                .organizationCode(user.getOrganization().getOrgCode())
                 .organizationName(user.getOrganization().getName())
                 .roleId(user.getAssignedRole().getId())
                 .roleCode(user.getAssignedRole().getRoleCode())