From f560afd231bdb571a7ef8b670d5597fbe326ab4f Mon Sep 17 00:00:00 2001 From: LeandroSilva Date: Mon, 19 Aug 2024 12:00:20 +0200 Subject: [PATCH 1/9] fix: CARITAS-243 - fix unit tests before code removal --- .../api/tenant/TechnicalUserTenantResolverTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/de/caritas/cob/videoservice/api/tenant/TechnicalUserTenantResolverTest.java b/src/test/java/de/caritas/cob/videoservice/api/tenant/TechnicalUserTenantResolverTest.java index 88ff38a..0f08975 100644 --- a/src/test/java/de/caritas/cob/videoservice/api/tenant/TechnicalUserTenantResolverTest.java +++ b/src/test/java/de/caritas/cob/videoservice/api/tenant/TechnicalUserTenantResolverTest.java @@ -62,7 +62,7 @@ void resolve_should_ResolveTechnicalTenantId_ForTechnicalUserRole() { void resolve_should_NotResolveTenantId_When_NonTechnicalUserRole() { // given givenUserIsAuthenticated(); - when(mockAuthentication.getPrincipal()).thenReturn(buildJwtWithRealmRole("another-role")); + when(mockAuthentication.getPrincipal()).thenReturn((Object) buildJwtWithRealmRole("another-role")); var resolved = technicalUserTenantResolver.resolve(authenticatedRequest); // then assertThat(resolved).isEmpty(); @@ -78,7 +78,7 @@ private Jwt buildJwtWithRealmRole(String realmRole) { headers.put("alg", "HS256"); // Signature algorithm headers.put("typ", "JWT"); // Token type return new Jwt( - "token", Instant.now(), Instant.now(), headers, givenClaimMapContainingRole(realmRole)); + "token", Instant.now(), Instant.now().plusSeconds(1), headers, givenClaimMapContainingRole(realmRole)); } private HashMap givenClaimMapContainingRole(String realmRole) { From 4cb8ce66ae49508ce65121b5d990c4a4dda9b7c7 Mon Sep 17 00:00:00 2001 From: LeandroSilva Date: Mon, 19 Aug 2024 12:08:06 +0200 Subject: [PATCH 2/9] fix: CARITAS-243 - remove /messages/feedback/new from messageservice.yaml --- services/messageservice.yaml | 48 ------------------------------------ 1 file changed, 48 deletions(-) diff --git a/services/messageservice.yaml b/services/messageservice.yaml index e9fa3ca..4d421fe 100644 --- a/services/messageservice.yaml +++ b/services/messageservice.yaml @@ -82,54 +82,6 @@ paths: - Bearer: [ ] x-codegen-request-body-name: Message - /messages/feedback/new: - post: - tags: - - message-controller - summary: 'Add new Rocket.Chat message to feedback chat [Authorization: authority - for feedback chat]' - operationId: createFeedbackMessage - parameters: - - name: rcToken - in: header - required: true - schema: - type: string - - name: rcUserId - in: header - required: true - schema: - type: string - - name: rcFeedbackGroupId - in: header - required: true - schema: - type: string - requestBody: - content: - 'application/json': - schema: - $ref: '#/components/schemas/MessageDTO' - required: true - responses: - 201: - description: CREATED - message was successfully created - content: - 'application/json': - schema: - $ref: '#/components/schemas/MessageResponseDTO' - 400: - description: BAD REQUEST - invalid/incomplete request or body object - 401: - description: UNAUTHORIZED - no/invalid Keycloak token - 403: - description: FORBIDDEN - no/invalid role/authorization - 500: - description: INTERNAL SERVER ERROR - server encountered unexpected condition - security: - - Bearer: [ ] - x-codegen-request-body-name: Message - /messages/videohint/new: post: tags: From 084f82c42c9cfeb830420888e5490972e77f2d10 Mon Sep 17 00:00:00 2001 From: LeandroSilva Date: Mon, 19 Aug 2024 12:10:16 +0200 Subject: [PATCH 3/9] fix: CARITAS-243 - remove /users/mails/messages/feedback/new from userservice.yaml --- services/userservice.yaml | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/services/userservice.yaml b/services/userservice.yaml index 726e36e..2cbb6b8 100644 --- a/services/userservice.yaml +++ b/services/userservice.yaml @@ -538,33 +538,6 @@ paths: description: INTERNAL SERVER ERROR - server encountered unexpected condition security: - Bearer: [ ] - /users/mails/messages/feedback/new: - post: - tags: - - user-controller - summary: 'Sends a notification e-mail that a new feedback message/answer has - been written [Authorization: Role: consultant with authority for feedback - chat]' - operationId: sendNewFeedbackMessageNotification - requestBody: - content: - 'application/json': - schema: - $ref: '#/components/schemas/NewMessageNotificationDTO' - required: true - responses: - 200: - description: successful operation - 400: - description: BAD REQUEST - invalid/incomplete request or body object - 401: - description: UNAUTHORIZED - invalid token - 409: - description: CONFLICT - no user e-mail address in db given - 500: - description: INTERNAL SERVER ERROR - server encountered unexpected condition - security: - - Bearer: [ ] /users/consultants: get: tags: From bebcb470728319548fdf5b3dea56a3d221e70636 Mon Sep 17 00:00:00 2001 From: LeandroSilva Date: Mon, 19 Aug 2024 12:16:42 +0200 Subject: [PATCH 4/9] fix: CARITAS-243 - remove feedback related fields from DTOs on userservice.yaml --- services/userservice.yaml | 11 ----------- .../api/tenant/TechnicalUserTenantResolverTest.java | 9 +++++++-- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/services/userservice.yaml b/services/userservice.yaml index 2cbb6b8..9a8b96c 100644 --- a/services/userservice.yaml +++ b/services/userservice.yaml @@ -1184,10 +1184,6 @@ components: type: string example: xGklslk2JJKK description: Rocket.Chat room ID - feedbackGroupId: - type: string - example: 8ertjlasdKJA - description: Rocket.Chat feedback room ID askerRcId: type: string example: 8ertjlasdKJA @@ -1202,9 +1198,6 @@ components: messagesRead: type: boolean example: false - feedbackRead: - type: boolean - example: true isTeamSession: type: boolean example: false @@ -1316,10 +1309,6 @@ components: type: string example: xGklslk2JJKK description: Rocket.Chat room ID - feedbackGroupId: - type: string - example: 8ertjlasdKJA - description: Rocket.Chat feedback room ID consultantId: type: string example: 926b9777-4eef-443d-925a-4aa534797bd7 diff --git a/src/test/java/de/caritas/cob/videoservice/api/tenant/TechnicalUserTenantResolverTest.java b/src/test/java/de/caritas/cob/videoservice/api/tenant/TechnicalUserTenantResolverTest.java index 0f08975..51f8ed8 100644 --- a/src/test/java/de/caritas/cob/videoservice/api/tenant/TechnicalUserTenantResolverTest.java +++ b/src/test/java/de/caritas/cob/videoservice/api/tenant/TechnicalUserTenantResolverTest.java @@ -62,7 +62,8 @@ void resolve_should_ResolveTechnicalTenantId_ForTechnicalUserRole() { void resolve_should_NotResolveTenantId_When_NonTechnicalUserRole() { // given givenUserIsAuthenticated(); - when(mockAuthentication.getPrincipal()).thenReturn((Object) buildJwtWithRealmRole("another-role")); + when(mockAuthentication.getPrincipal()) + .thenReturn((Object) buildJwtWithRealmRole("another-role")); var resolved = technicalUserTenantResolver.resolve(authenticatedRequest); // then assertThat(resolved).isEmpty(); @@ -78,7 +79,11 @@ private Jwt buildJwtWithRealmRole(String realmRole) { headers.put("alg", "HS256"); // Signature algorithm headers.put("typ", "JWT"); // Token type return new Jwt( - "token", Instant.now(), Instant.now().plusSeconds(1), headers, givenClaimMapContainingRole(realmRole)); + "token", + Instant.now(), + Instant.now().plusSeconds(1), + headers, + givenClaimMapContainingRole(realmRole)); } private HashMap givenClaimMapContainingRole(String realmRole) { From 598579007bea2049e94e1892a2d36be9830e9943 Mon Sep 17 00:00:00 2001 From: LeandroSilva Date: Mon, 26 Aug 2024 12:18:55 +0200 Subject: [PATCH 5/9] fix: CARITAS-243 - remove ForwardMessageDTO --- services/userservice.yaml | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/services/userservice.yaml b/services/userservice.yaml index 9a8b96c..73f9223 100644 --- a/services/userservice.yaml +++ b/services/userservice.yaml @@ -1228,35 +1228,11 @@ components: AliasMessageDTO: type: object properties: - forwardMessageDTO: - $ref: '#/components/schemas/ForwardMessageDTO' videoCallMessageDTO: $ref: '#/components/schemas/VideoCallMessageDTO' messageType: $ref: '#/components/schemas/MessageType' - ForwardMessageDTO: - type: object - required: - - message - - timestamp - - username - - rcUserId - properties: - message: - type: string - example: "Lorem ipsum dolor sit amet, consetetur..." - timestamp: - type: string - description: "Full qualified timestamp" - example: "2018-11-15T09:33:00.057Z" - username: - type: string - example: "asker23" - rcUserId: - type: string - example: "ag89h3tjkerg94t" - VideoCallMessageDTO: type: object required: From 317155857aba8af5e05e836e90c7d68d8673512a Mon Sep 17 00:00:00 2001 From: LeandroSilva Date: Mon, 26 Aug 2024 12:37:19 +0200 Subject: [PATCH 6/9] fix: CARITAS-243 - remove /messages/forward api from messageservice.yaml --- services/messageservice.yaml | 48 ------------------------------------ 1 file changed, 48 deletions(-) diff --git a/services/messageservice.yaml b/services/messageservice.yaml index 4d421fe..4165327 100644 --- a/services/messageservice.yaml +++ b/services/messageservice.yaml @@ -275,54 +275,6 @@ paths: security: - Bearer: [ ] - /messages/forward: - post: - tags: - - message-controller - summary: 'Forward a Rocket.Chat message to another group [Authorization: Role: - u25-consultant]' - operationId: forwardMessage - parameters: - - name: rcToken - in: header - required: true - schema: - type: string - - name: rcUserId - in: header - required: true - schema: - type: string - - name: rcGroupId - in: header - required: true - schema: - type: string - requestBody: - description: Body description - content: - 'application/json': - schema: - $ref: '#/components/schemas/ForwardMessageDTO' - required: true - responses: - 201: - description: CREATED - message was successfully created - content: - 'application/json': - schema: - $ref: '#/components/schemas/MessageResponseDTO' - 400: - description: BAD REQUEST - invalid/incomplete request or body object - 401: - description: UNAUTHORIZED - no/invalid Keycloak token - 403: - description: FORBIDDEN - no/invalid role/authorization - 500: - description: INTERNAL SERVER ERROR - server encountered unexpected condition - security: - - Bearer: [ ] - /messages/draft: post: tags: From acf68f4ee357f7fe63630774b27f0dbe02fc144e Mon Sep 17 00:00:00 2001 From: LeandroSilva Date: Mon, 26 Aug 2024 12:53:11 +0200 Subject: [PATCH 7/9] fix: CARITAS-243 - remove forwardMessageDTO --- services/messageservice.yaml | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/services/messageservice.yaml b/services/messageservice.yaml index 4165327..af36349 100644 --- a/services/messageservice.yaml +++ b/services/messageservice.yaml @@ -531,8 +531,6 @@ components: AliasMessageDTO: type: object properties: - forwardMessageDTO: - $ref: '#/components/schemas/ForwardMessageDTO' videoCallMessageDTO: $ref: '#/components/schemas/VideoCallMessageDTO' messageType: @@ -540,36 +538,6 @@ components: content: type: string - ForwardMessageDTO: - type: object - required: - - message - - timestamp - - username - - rcUserId - properties: - message: - type: string - example: "Lorem ipsum dolor sit amet, consetetur..." - org: - type: string - example: "Lorem ipsum dolor sit amet, consetetur..." - description: "Legacy fallback for stringified messages" - timestamp: - type: string - description: "Full qualified timestamp" - example: "2018-11-15T09:33:00.057Z" - username: - type: string - example: "asker23" - displayName: - type: string - rcUserId: - type: string - example: "ag89h3tjkerg94t" - t: - type: string - VideoCallMessageDTO: type: object required: From a83e70a6ed552b7372728a102b290f976a963d0c Mon Sep 17 00:00:00 2001 From: LeandroSilva Date: Mon, 26 Aug 2024 12:55:17 +0200 Subject: [PATCH 8/9] fix: CARITAS-243 - remove forward message type --- services/userservice.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/services/userservice.yaml b/services/userservice.yaml index 73f9223..c853036 100644 --- a/services/userservice.yaml +++ b/services/userservice.yaml @@ -1256,7 +1256,6 @@ components: enum: - "FURTHER_STEPS" - "UPDATE_SESSION_DATA" - - "FORWARD" - "VIDEOCALL" ConsultantSessionDTO: From e68f76b690bd93ea028ee3eda809d4bd9af367a0 Mon Sep 17 00:00:00 2001 From: LeandroSilva Date: Mon, 26 Aug 2024 13:04:10 +0200 Subject: [PATCH 9/9] fix: CARITAS-243 - remove forward message type --- services/messageservice.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/services/messageservice.yaml b/services/messageservice.yaml index af36349..1038fad 100644 --- a/services/messageservice.yaml +++ b/services/messageservice.yaml @@ -578,7 +578,6 @@ components: - "APPOINTMENT_CANCELLED" - "APPOINTMENT_RESCHEDULED" - "FINISHED_CONVERSATION" - - "FORWARD" - "FURTHER_STEPS" - "UPDATE_SESSION_DATA" - "VIDEOCALL"