Merge pull request #449 from Onlineberatung/fix-last-message-type

fix: missing lastMessageType response due to changed alias-message de…
Onlineberatung · Jul 27, 2022 · c452660 · c452660
2 parents 4201a7f + c819088
commit c452660
Show file tree

Hide file tree

Showing 2 changed files with 69 additions and 2 deletions.
diff --git a/api/userservice.yaml b/api/userservice.yaml
@@ -2090,6 +2090,8 @@ components:
           $ref: '#/components/schemas/VideoCallMessageDTO'
         messageType:
           $ref: '#/components/schemas/MessageType'
+        content:
+          type: string
 
     ForwardMessageDTO:
       type: object
@@ -2143,6 +2145,9 @@ components:
     MessageType:
       type: string
       enum:
+        - "APPOINTMENT_SET"
+        - "APPOINTMENT_CANCELLED"
+        - "APPOINTMENT_RESCHEDULED"
         - "FURTHER_STEPS"
         - "UPDATE_SESSION_DATA"
         - "FORWARD"

diff --git a/...va/de/caritas/cob/userservice/api/adapters/web/controller/UserControllerSessionE2EIT.java b/...va/de/caritas/cob/userservice/api/adapters/web/controller/UserControllerSessionE2EIT.java
@@ -505,6 +505,66 @@ void getSessionsForAuthenticatedUserShouldReturnSessionsLastMessageTypeE2eeActiv
         .andExpect(jsonPath("sessions[1].chat", is(nullValue())));
   }
 
+  @Test
+  @WithMockUser(authorities = AuthorityValue.USER_DEFAULT)
+  void getSessionsForAuthenticatedUserShouldReturnSessionsLastMessageTypeResetLastMessage()
+      throws Exception {
+    givenAValidUser(true);
+    givenAValidConsultant();
+    givenASessionInProgress();
+    givenAValidRocketChatSystemUser();
+    givenAValidRocketChatGetRoomsResponse(session.getGroupId(),
+        MessageType.REASSIGN_CONSULTANT_RESET_LAST_MESSAGE, null);
+    givenAnEmptyRocketChatGetSubscriptionsResponse();
+    user.getSessions().forEach(session ->
+        givenAValidRocketChatInfoUserResponse(session.getConsultant())
+    );
+
+    mockMvc.perform(
+            get("/users/sessions/askers")
+                .cookie(CSRF_COOKIE)
+                .header(CSRF_HEADER, CSRF_VALUE)
+                .header(RC_TOKEN_HEADER_PARAMETER_NAME, RC_TOKEN)
+                .accept(MediaType.APPLICATION_JSON)
+        )
+        .andExpect(status().isOk())
+        .andExpect(jsonPath("sessions", hasSize(2)))
+        .andExpect(jsonPath("sessions[*].session.lastMessageType",
+            containsInAnyOrder("REASSIGN_CONSULTANT_RESET_LAST_MESSAGE", "FURTHER_STEPS")))
+        .andExpect(jsonPath("sessions[0].chat", is(nullValue())))
+        .andExpect(jsonPath("sessions[1].chat", is(nullValue())));
+  }
+
+  @Test
+  @WithMockUser(authorities = AuthorityValue.USER_DEFAULT)
+  void getSessionsForAuthenticatedUserShouldReturnSessionsLastMessageTypeReassignConsultant()
+      throws Exception {
+    givenAValidUser(true);
+    givenAValidConsultant();
+    givenASessionInProgress();
+    givenAValidRocketChatSystemUser();
+    givenAValidRocketChatGetRoomsResponse(session.getGroupId(), MessageType.REASSIGN_CONSULTANT,
+        "a message");
+    givenAnEmptyRocketChatGetSubscriptionsResponse();
+    user.getSessions().forEach(session ->
+        givenAValidRocketChatInfoUserResponse(session.getConsultant())
+    );
+
+    mockMvc.perform(
+            get("/users/sessions/askers")
+                .cookie(CSRF_COOKIE)
+                .header(CSRF_HEADER, CSRF_VALUE)
+                .header(RC_TOKEN_HEADER_PARAMETER_NAME, RC_TOKEN)
+                .accept(MediaType.APPLICATION_JSON)
+        )
+        .andExpect(status().isOk())
+        .andExpect(jsonPath("sessions", hasSize(2)))
+        .andExpect(jsonPath("sessions[*].session.lastMessageType",
+            containsInAnyOrder("REASSIGN_CONSULTANT", "FURTHER_STEPS")))
+        .andExpect(jsonPath("sessions[0].chat", is(nullValue())))
+        .andExpect(jsonPath("sessions[1].chat", is(nullValue())));
+  }
+
   @Test
   @WithMockUser(authorities = {AuthorityValue.USER_DEFAULT})
   void getSessionsForGroupOrFeedbackGroupIdsShouldFindSessionsByGroupOrFeedbackGroup()
@@ -599,7 +659,8 @@ void getSessionsForGroupOrFeedbackGroupIdsShouldContainConsultantOfUserSession()
         .andExpect(status().isOk())
         .andExpect(jsonPath("sessions[0].session.groupId", is("YWKxhFX5K2HPpsFbs")))
         .andExpect(jsonPath("sessions[0].consultant.username", is("u25main")))
-        .andExpect(jsonPath("sessions[0].consultant.id", is("bad14912-cf9f-4c16-9d0e-fe8ede9b60dc")))
+        .andExpect(
+            jsonPath("sessions[0].consultant.id", is("bad14912-cf9f-4c16-9d0e-fe8ede9b60dc")))
         .andExpect(jsonPath("sessions[0].consultant.firstName").doesNotExist())
         .andExpect(jsonPath("sessions[0].consultant.lastName").doesNotExist())
         .andExpect(jsonPath("sessions[0].agency", is(notNullValue())))
@@ -717,7 +778,8 @@ void getSessionForIdShouldFindSessionsBySessionId()
         .andExpect(jsonPath("sessions[0].session.id", is(900)))
         .andExpect(jsonPath("sessions[0].session.groupId", is("YWKxhFX5K2HPpsFbs")))
         .andExpect(jsonPath("sessions[0].consultant.username", is("u25main")))
-        .andExpect(jsonPath("sessions[0].consultant.id", is("bad14912-cf9f-4c16-9d0e-fe8ede9b60dc")))
+        .andExpect(
+            jsonPath("sessions[0].consultant.id", is("bad14912-cf9f-4c16-9d0e-fe8ede9b60dc")))
         .andExpect(jsonPath("sessions[0].consultant.firstName").doesNotExist())
         .andExpect(jsonPath("sessions[0].consultant.lastName").doesNotExist())
         .andExpect(jsonPath("sessions[0].agency", is(notNullValue())))