Skip to content

Update QuestionLogicClient.java #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tberey merged 3 commits into from
Jan 22, 2026
Merged

Update QuestionLogicClient.java #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3eba5f5
Update QuestionLogicClient.java
tberey Jan 22, 2026
e8f905f
Update QuestionLogicClientTest.java
tberey Jan 22, 2026
fce5abe
Update QuestionLogicClientTest.java
tberey Jan 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/uk/gov/ccs/BLL/QuestionLogicClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public QuestionWriteResponse createOrUpdateQuestions(QuestionWrite questionWrite
* @param eventId to retrieve questions for that eventId
* @return list of questions {@link List<Questions>}
*/
@Cacheable(value = "qAndACache", key = "#root.methodName + '-' + #eventId")
//@Cacheable(value = "qAndACache", key = "#root.methodName + '-' + #eventId")
public List<Questions> getQuestionsWithEventId(final String eventId) {
return questionService.getQuestionsWithEventId(eventId);
}
Expand All @@ -123,7 +123,7 @@ public long deleteQuestion(String eventId, String questionId) {
* @param eventType Event type (e.g., "FC")
* @return List of DataTemplate objects (same format as agreements-service)
*/
@Cacheable(value = "dataTemplatesCache", key = "#agreementId + '-' + #lotId + '-' + #eventType")
//@Cacheable(value = "dataTemplatesCache", key = "#agreementId + '-' + #lotId + '-' + #eventType")
public List<DataTemplate> getEventDataTemplates(
String agreementId, String lotId, String eventType) {
try {
Expand Down
10 changes: 5 additions & 5 deletions src/test/java/uk/gov/ccs/BLL/QuestionLogicClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ void getQuestionsWithEventIdShouldBeCalledOnceWhenCalledMultipleTimes() {
client.getQuestionsWithEventId(TEST_EVENT_ID);

// Assert: Service call count must be 1
verify(questionService, times(1)).getQuestionsWithEventId(TEST_EVENT_ID);
verify(questionService, times(3)).getQuestionsWithEventId(TEST_EVENT_ID);
}

@Test
Expand All @@ -112,7 +112,7 @@ void deleteQuestionShouldEvictCacheForcingSecondServiceCall() {
client.getQuestionsWithEventId(TEST_EVENT_ID);

// Verification point: Service has been called once so far
verify(questionService, times(1)).getQuestionsWithEventId(TEST_EVENT_ID);
verify(questionService, times(2)).getQuestionsWithEventId(TEST_EVENT_ID);

// 3. Eviction: Call the delete method which has @CacheEvict
client.deleteQuestion(TEST_EVENT_ID, "QID-999");
Expand All @@ -121,7 +121,7 @@ void deleteQuestionShouldEvictCacheForcingSecondServiceCall() {
client.getQuestionsWithEventId(TEST_EVENT_ID);

// Assert: Service call count must be 2
verify(questionService, times(2)).getQuestionsWithEventId(TEST_EVENT_ID);
verify(questionService, times(3)).getQuestionsWithEventId(TEST_EVENT_ID);
}

/**
Expand All @@ -148,7 +148,7 @@ void getEventDataTemplatesShouldBeCalledOnceWhenCalledMultipleTimes() {
List<DataTemplate> result3 = client.getEventDataTemplates(agreementId, lotId, eventType);

// Assert: Service call count must be 1
verify(templateDataService, times(1)).getEventDataTemplates(agreementId, lotId, eventType);
verify(templateDataService, times(3)).getEventDataTemplates(agreementId, lotId, eventType);
assertEquals(mockTemplates, result1);
assertEquals(mockTemplates, result2);
assertEquals(mockTemplates, result3);
Expand Down Expand Up @@ -204,4 +204,4 @@ void getEventDataTemplatesShouldReturnEmptyListWhenServiceReturnsEmpty() {
verify(templateDataService, times(1)).getEventDataTemplates("RM1043.8", "1", "FC");
}

}
}
Loading