Merge pull request #21 from zireline/get-all-user

Get all user

dockerfile

@@ -25,4 +25,5 @@ COPY --from=builder /app/target/shield**.jar /app
 EXPOSE 8080
 
 # Run the application
+RUN ["ls", "-a"]
 CMD ["java", "-jar", "shield**.jar"]

src/main/java/com/splitscale/shield/config/CredentialRepositoryConfig.java

@@ -6,6 +6,7 @@
 import org.springframework.context.annotation.Configuration;
 
 import com.google.gson.Gson;
+import com.splitscale.shield.credential.read.ReadAllCredentialInteractor;
 import com.splitscale.shield.credential.read.ReadCredentialInteractor;
 import com.splitscale.shield.io.CredentialFileManager;
 import com.splitscale.shield.io.PathProvider;
@@ -19,6 +20,11 @@ ReadCredentialInteractor getReadUserInteractor(CredentialRepository repository)
     return new ReadCredentialInteractor(repository);
   }
 
+  @Bean
+  ReadAllCredentialInteractor getReadAllUserInteractor(CredentialRepository repository) {
+    return new ReadAllCredentialInteractor(repository);
+  }
+
   @Bean
   CredentialRepository getUserRepository(CredentialFileManager jsonFileManager) {
     return new CredentialRepositoryImpl(jsonFileManager);

src/main/java/com/splitscale/shield/config/GetAllUserInfoConfig.java

@@ -3,6 +3,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
+import com.splitscale.shield.credential.read.ReadAllCredentialInteractor;
 import com.splitscale.shield.endpoints.users.get.GetAllUserInfo;
 import com.splitscale.shield.repositories.UserInfoRepository;
 import com.splitscale.shield.userinfo.getall.GetAllUserInfoInteractor;
@@ -16,8 +17,9 @@ public GetAllUserInfo getAllUserInfo(GetAllUserInfoWorkflow workflow) {
   }
 
   @Bean
-  public GetAllUserInfoWorkflow getAllUserInfoWorkflow(GetAllUserInfoInteractor interactor) {
-    return new GetAllUserInfoWorkflow(interactor);
+  public GetAllUserInfoWorkflow getAllUserInfoWorkflow(GetAllUserInfoInteractor interactor,
+      ReadAllCredentialInteractor read) {
+    return new GetAllUserInfoWorkflow(interactor, read);
   }
 
   @Bean

src/main/java/com/splitscale/shield/credential/read/ReadAllCredentialInteractor.java

@@ -0,0 +1,19 @@
+package com.splitscale.shield.credential.read;
+
+import java.io.IOException;
+import java.util.List;
+
+import com.splitscale.shield.credential.Credential;
+import com.splitscale.shield.repositories.CredentialRepository;
+
+public class ReadAllCredentialInteractor {
+  private CredentialRepository repository;
+
+  public ReadAllCredentialInteractor(CredentialRepository repository) {
+    this.repository = repository;
+  }
+
+  public List<Credential> getAllCredentials() throws IOException {
+    return repository.getAll();
+  }
+}

src/main/java/com/splitscale/shield/workflows/updateuserinfo/GetAllUserInfoWorkflow.java

@@ -1,22 +1,51 @@
 package com.splitscale.shield.workflows.updateuserinfo;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
 
+import com.splitscale.shield.credential.Credential;
+import com.splitscale.shield.credential.read.ReadAllCredentialInteractor;
 import com.splitscale.shield.userinfo.UserInfo;
 import com.splitscale.shield.userinfo.getall.GetAllUserInfoInteractor;
 
 public class GetAllUserInfoWorkflow {
   GetAllUserInfoInteractor getAllUserInfoInteractor;
+  ReadAllCredentialInteractor readAllCredentialInteractor;
 
   public GetAllUserInfoWorkflow() {
   }
 
-  public GetAllUserInfoWorkflow(GetAllUserInfoInteractor getAllUserInfoInteractor) {
+  public GetAllUserInfoWorkflow(GetAllUserInfoInteractor getAllUserInfoInteractor,
+      ReadAllCredentialInteractor readAllCredentialInteractor) {
     this.getAllUserInfoInteractor = getAllUserInfoInteractor;
+    this.readAllCredentialInteractor = readAllCredentialInteractor;
   }
 
   public List<UserInfo> getAll() throws IOException {
-    return getAllUserInfoInteractor.getAll();
+    List<UserInfo> userInfos = getAllUserInfoInteractor.getAll();
+    List<Credential> credentials = readAllCredentialInteractor.getAllCredentials();
+
+    for (UserInfo userInfo : userInfos) {
+      // Find the corresponding Credential for the current UserInfo
+      Credential credential = findCredentialById(credentials, userInfo.getId());
+
+      // Update UserInfo with values from Credential
+      if (credential != null) {
+        userInfo.setFirstName(credential.getUsername());
+        // Update other fields as needed
+      }
+    }
+
+    return userInfos;
+  }
+
+  private Credential findCredentialById(List<Credential> credentials, String userId) {
+    for (Credential credential : credentials) {
+      if (userId.matches(credential.getUserId())) {
+        return credential;
+      }
+    }
+    return null;
   }
 }