diff --git a/server/src/main/java/com/objectcomputing/checkins/services/memberprofile/csvreport/MemberProfileReportRepository.java b/server/src/main/java/com/objectcomputing/checkins/services/memberprofile/csvreport/MemberProfileReportRepository.java index 5e8d5e1743..8ddde0ad12 100644 --- a/server/src/main/java/com/objectcomputing/checkins/services/memberprofile/csvreport/MemberProfileReportRepository.java +++ b/server/src/main/java/com/objectcomputing/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 findAllByMemberIds(List memberIds, String aesKey); - + @ParameterExpression(name = "aesKey", expression = "#{ env['aes.key'] }") + List findAllByMemberIds(List memberIds); } diff --git a/server/src/main/java/com/objectcomputing/checkins/services/memberprofile/csvreport/MemberProfileReportServicesImpl.java b/server/src/main/java/com/objectcomputing/checkins/services/memberprofile/csvreport/MemberProfileReportServicesImpl.java index c62ff6bcca..fc9b470a1d 100644 --- a/server/src/main/java/com/objectcomputing/checkins/services/memberprofile/csvreport/MemberProfileReportServicesImpl.java +++ b/server/src/main/java/com/objectcomputing/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 memberIds = queryDTO.getMemberIds().stream().map(UUID::toString).collect(Collectors.toList()); - List filteredRecords = memberProfileReportRepository.findAllByMemberIds(memberIds, key); + List 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 index b2a96ef94c..b35aa64d0e 100644 --- a/server/src/test/java/com/objectcomputing/checkins/services/TestContainersSuite.java +++ b/server/src/test/java/com/objectcomputing/checkins/services/TestContainersSuite.java @@ -37,9 +37,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/server/src/test/java/com/objectcomputing/checkins/services/memberprofile/csvreport/MemberProfileReportControllerTest.java b/server/src/test/java/com/objectcomputing/checkins/services/memberprofile/csvreport/MemberProfileReportControllerTest.java index 8dae939ba9..b80a19a32c 100644 --- a/server/src/test/java/com/objectcomputing/checkins/services/memberprofile/csvreport/MemberProfileReportControllerTest.java +++ b/server/src/test/java/com/objectcomputing/checkins/services/memberprofile/csvreport/MemberProfileReportControllerTest.java @@ -105,7 +105,7 @@ public void testGetSelectedMemberProfileRecords() { List selectedMemberIds = new ArrayList<>(); selectedMemberIds.add(member2.getId().toString()); selectedMemberIds.add(member4.getId().toString()); - List records = getMemberProfileReportRepository().findAllByMemberIds(selectedMemberIds, key); + List records = getMemberProfileReportRepository().findAllByMemberIds(selectedMemberIds); assertEquals(2, records.size()); assertMemberProfileMatchesRecord(member4, records.get(0)); diff --git a/server/src/test/java/com/objectcomputing/checkins/services/memberprofile/csvreport/MemberProfileReportServicesImplTest.java b/server/src/test/java/com/objectcomputing/checkins/services/memberprofile/csvreport/MemberProfileReportServicesImplTest.java index ce333533f5..38d7993dd3 100644 --- a/server/src/test/java/com/objectcomputing/checkins/services/memberprofile/csvreport/MemberProfileReportServicesImplTest.java +++ b/server/src/test/java/com/objectcomputing/checkins/services/memberprofile/csvreport/MemberProfileReportServicesImplTest.java @@ -75,7 +75,7 @@ void testGenerateFileWithSelectedMemberProfiles() throws IOException { List 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 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());