Add and manage announcements #30
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Florent MILLOT <millotflo@gmail.com>
TheMaskedTurtle
requested changes
Apr 2, 2024
src/main/java/org/gridsuite/useradmin/server/UserAdminController.java
Outdated
Show resolved
Hide resolved
src/main/java/org/gridsuite/useradmin/server/UserAdminController.java
Outdated
Show resolved
Hide resolved
src/main/java/org/gridsuite/useradmin/server/UserAdminController.java
Outdated
Show resolved
Hide resolved
src/main/java/org/gridsuite/useradmin/server/UserAdminController.java
Outdated
Show resolved
Hide resolved
src/main/java/org/gridsuite/useradmin/server/UserAdminController.java
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
If you create AnnouncementController then you can connect AnnoucementController and AnnouncementService directly
Comment on lines
+311
to
328
| @Test | ||
| void testGetAllMaintenanceMessages() throws Exception { | ||
| announcementRepository.save(new AnnouncementEntity("I think dangling line is a funny name for a line", Duration.ofSeconds(60))); | ||
| assertEquals(1, announcementRepository.findAll().size()); | ||
|
|
||
| // Try to retrieve all the messages and expect everything to be ok | ||
| MvcResult mvcResult = mockMvc.perform(get("/" + UserAdminApi.API_VERSION + "/announcements") | ||
| .header("userId", ADMIN_USER)) | ||
| .andExpect(status().isOk()).andReturn(); | ||
| List<AnnouncementEntity> announcements = objectMapper.readValue(mvcResult.getResponse().getContentAsString(), new TypeReference<>() { | ||
| }); | ||
| assertEquals(1, announcements.size()); | ||
|
|
||
| // Try to retrieve all the messages with a user that's not an admin and expect 403 FORBIDDEN | ||
| mockMvc.perform(get("/" + UserAdminApi.API_VERSION + "/announcements") | ||
| .header("userId", NOT_ADMIN)) | ||
| .andExpect(status().isForbidden()); | ||
| } |
There was a problem hiding this comment.
Can you separete the tests for OK results and for forbidden ?
There was a problem hiding this comment.
I just updated and completed the test, I prefer to keep them like it was (TL already told me few times to change only the necessary so that's what I do now)
Comment on lines
288
to
309
| @Test | ||
| public void testCancelMaintenanceMessage() throws Exception { | ||
| AnnouncementEntity announcement = announcementRepository.save(new AnnouncementEntity("I think dangling line is a funny name for a line", Duration.ofSeconds(60))); | ||
| assertEquals(1, announcementRepository.findAll().size()); | ||
|
|
||
| //Send a cancel maintenance message and expect everything to be ok | ||
| mockMvc.perform(post("/" + UserAdminApi.API_VERSION + "/messages/cancel-maintenance") | ||
| mockMvc.perform(delete("/" + UserAdminApi.API_VERSION + "/announcements/" + announcement.getId()) | ||
| .header("userId", ADMIN_USER)) | ||
| .andExpect(status().isOk()); | ||
| assertCancelMaintenanceMessageSent(); | ||
| assertEquals(0, announcementRepository.findAll().size()); | ||
|
|
||
| // With a non-existing ID, expect 404 | ||
| mockMvc.perform(delete("/" + UserAdminApi.API_VERSION + "/announcements/" + UUID.randomUUID()) | ||
| .header("userId", ADMIN_USER)) | ||
| .andExpect(status().isNotFound()); | ||
|
|
||
| //Send a cancel maintenance message with a user that's not an admin and expect 403 FORBIDDEN | ||
| mockMvc.perform(post("/" + UserAdminApi.API_VERSION + "/messages/cancel-maintenance") | ||
| mockMvc.perform(delete("/" + UserAdminApi.API_VERSION + "/announcements/" + UUID.randomUUID()) | ||
| .header("userId", NOT_ADMIN)) | ||
| .andExpect(status().isForbidden()); | ||
| } |
src/test/java/org/gridsuite/useradmin/server/UserAdminTest.java
Outdated
Show resolved
Hide resolved
Comment on lines
+40
to
+44
| if (announcement.getDuration() == null) { | ||
| notificationService.emitMaintenanceMessage(announcement.getMessage()); | ||
| } else { | ||
| notificationService.emitMaintenanceMessage(announcement.getMessage(), announcement.getDuration().toSeconds()); | ||
| } |
There was a problem hiding this comment.
Maybe this can be handled in the EmitMessage method
There was a problem hiding this comment.
I would have done that also, but it's not a big deal and does not change that much so I kept the existing code
Signed-off-by: Florent MILLOT <millotflo@gmail.com>
|
Signed-off-by: Abdelsalem <abdelsalem.hedhili@rte-france.com>
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.