Merge pull request #2441 from objectcomputing/bugfix-remove-aeskey-in…

…jection-in-service Remove aesKey injection in Service and resolve in Repository interface instead
objectcomputing · May 28, 2024 · 40d8f52 · 40d8f52
2 parents 262ab8b + 78097e3
commit 40d8f52
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 13 deletions.
diff --git a/...ectcomputing/checkins/services/memberprofile/csvreport/MemberProfileReportRepository.java b/...ectcomputing/checkins/services/memberprofile/csvreport/MemberProfileReportRepository.java
@@ -1,6 +1,7 @@
 package com.objectcomputing.checkins.services.memberprofile.csvreport;
 
 import io.micronaut.core.annotation.NonNull;
+import io.micronaut.data.annotation.ParameterExpression;
 import io.micronaut.data.annotation.Query;
 import io.micronaut.data.jdbc.annotation.JdbcRepository;
 import io.micronaut.data.model.query.builder.sql.Dialect;
@@ -31,6 +32,6 @@ public interface MemberProfileReportRepository extends CrudRepository<MemberProf
                     "PGP_SYM_DECRYPT(cast(supervisoremail as bytea), :aesKey) as supervisorEmail " +
             "FROM member_profile_record " +
             "WHERE id IN (:memberIds)")
-    List<MemberProfileRecord> findAllByMemberIds(List<String> memberIds, String aesKey);
-
+    @ParameterExpression(name = "aesKey", expression = "#{ env['aes.key'] }")
+    List<MemberProfileRecord> findAllByMemberIds(List<String> memberIds);
 }
diff --git a/...tcomputing/checkins/services/memberprofile/csvreport/MemberProfileReportServicesImpl.java b/...tcomputing/checkins/services/memberprofile/csvreport/MemberProfileReportServicesImpl.java
@@ -1,6 +1,5 @@
 package com.objectcomputing.checkins.services.memberprofile.csvreport;
 
-import io.micronaut.context.annotation.Value;
 import jakarta.inject.Singleton;
 import org.apache.commons.csv.CSVFormat;
 import org.apache.commons.csv.CSVPrinter;
@@ -20,9 +19,6 @@ public class MemberProfileReportServicesImpl implements MemberProfileReportServi
     private final MemberProfileReportRepository memberProfileReportRepository;
     private final MemberProfileFileProvider memberProfileFileProvider;
 
-    @Value("${aes.key}")
-    private String key;
-
     public MemberProfileReportServicesImpl(MemberProfileReportRepository memberProfileReportRepository,
                                            MemberProfileFileProvider memberProfileFileProvider) {
         this.memberProfileReportRepository = memberProfileReportRepository;
@@ -37,7 +33,7 @@ public File generateFile(MemberProfileReportQueryDTO queryDTO) {
             memberRecords.addAll(allRecords);
         } else {
             List<String> memberIds = queryDTO.getMemberIds().stream().map(UUID::toString).collect(Collectors.toList());
-            List<MemberProfileRecord> filteredRecords = memberProfileReportRepository.findAllByMemberIds(memberIds, key);
+            List<MemberProfileRecord> filteredRecords = memberProfileReportRepository.findAllByMemberIds(memberIds);
             memberRecords.addAll(filteredRecords);
         }
         return createCsv(memberRecords);

diff --git a/server/src/test/java/com/objectcomputing/checkins/services/TestContainersSuite.java b/server/src/test/java/com/objectcomputing/checkins/services/TestContainersSuite.java
@@ -30,9 +30,6 @@ public abstract class TestContainersSuite implements RepositoryFixture, TestProp
     @Inject
     private Flyway flyway;
 
-    @Value("${aes.key}")
-    protected String key;
-
     public TestContainersSuite() {}
 
     private void deleteAllEntities() {

diff --git a/...omputing/checkins/services/memberprofile/csvreport/MemberProfileReportControllerTest.java b/...omputing/checkins/services/memberprofile/csvreport/MemberProfileReportControllerTest.java
@@ -105,7 +105,7 @@ public void testGetSelectedMemberProfileRecords() {
         List<String> selectedMemberIds = new ArrayList<>();
         selectedMemberIds.add(member2.getId().toString());
         selectedMemberIds.add(member4.getId().toString());
-        List<MemberProfileRecord> records = getMemberProfileReportRepository().findAllByMemberIds(selectedMemberIds, key);
+        List<MemberProfileRecord> records = getMemberProfileReportRepository().findAllByMemberIds(selectedMemberIds);
 
         assertEquals(2, records.size());
         assertMemberProfileMatchesRecord(member4, records.get(0));

diff --git a/...puting/checkins/services/memberprofile/csvreport/MemberProfileReportServicesImplTest.java b/...puting/checkins/services/memberprofile/csvreport/MemberProfileReportServicesImplTest.java
@@ -75,7 +75,7 @@ void testGenerateFileWithSelectedMemberProfiles() throws IOException {
         List<MemberProfileRecord> allRecords = createSampleRecords();
         MemberProfileRecord expectedRecord = allRecords.get(1);
         when(memberProfileReportRepository
-                .findAllByMemberIds(eq(List.of(expectedRecord.getId().toString())), any()))
+                .findAllByMemberIds(eq(List.of(expectedRecord.getId().toString()))))
                 .thenReturn(List.of(expectedRecord));
         File tmpFile = File.createTempFile("member",".csv");
         tmpFile.deleteOnExit();
@@ -98,7 +98,7 @@ void testGenerateFileNotGenerated() throws IOException {
         List<MemberProfileRecord> allRecords = createSampleRecords();
         MemberProfileRecord expectedRecord = allRecords.get(1);
         when(memberProfileReportRepository
-                .findAllByMemberIds(eq(List.of(expectedRecord.getId().toString())), any()))
+                .findAllByMemberIds(eq(List.of(expectedRecord.getId().toString()))))
                 .thenReturn(List.of(expectedRecord));
 
         when(memberProfileFileProvider.provideFile()).thenThrow(new RuntimeException());