Caritas 243 remove legacy code

api/userservice.yaml

@@ -249,9 +249,9 @@ paths:
     get:
       tags:
         - user-controller
-      summary: 'Returns sessions for given RocketChat group or feedback group IDs.
+      summary: 'Returns sessions for given RocketChat group IDs.
       [Authorization: Role: user, consultant]'
-      operationId: getSessionsForGroupOrFeedbackGroupIds
+      operationId: getSessionsForGroupIds
       parameters:
         - name: RCToken
           in: header
@@ -877,33 +877,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/mails/reassignment:
     post:
       tags:
@@ -2058,13 +2031,6 @@ components:
           type: string
           example: xGklslk2JJKK
           description: Rocket.Chat room ID
-        feedbackGroupId:
-          type: string
-          example: 8ertjlasdKJA
-          description: Rocket.Chat feedback room ID
-        isPeerChat:
-          type: boolean
-          example: false
         askerRcId:
           type: string
           example: 8ertjlasdKJA
@@ -2082,9 +2048,6 @@ components:
         messagesRead:
           type: boolean
           example: false
-        feedbackRead:
-          type: boolean
-          example: true
         isTeamSession:
           type: boolean
           example: false
@@ -2248,10 +2211,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
@@ -3117,7 +3076,6 @@ components:
       enum:
         - DAILY_ENQUIRY
         - NEW_CHAT_MESSAGE_FROM_ADVICE_SEEKER
-        - NEW_FEEDBACK_MESSAGE_FROM_ADVICE_SEEKER
 
   securitySchemes:
     Bearer:

services/consultingtypeservice.yaml

@@ -204,9 +204,6 @@ components:
             lockedAgencies:
               type: boolean
               example: false
-            excludeNonMainConsultantsFromTeamSessions:
-              type: boolean
-              example: true
             whiteSpot:
               allOf:
                 - $ref: '#/components/schemas/WhiteSpotDTO'
@@ -225,12 +222,6 @@ components:
             sessionDataInitializing:
               allOf:
                 - $ref: '#/components/schemas/SessionDataInitializingDTO'
-            initializeFeedbackChat:
-              type: boolean
-              example: true
-            isPeerChat:
-              type: boolean
-              example: true
             roles:
               $ref: '#/components/schemas/RolesDTO'
             notifications:

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:
@@ -209,54 +161,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:
@@ -592,7 +496,6 @@ components:
       type: string
       enum:
         - "FINISHED_CONVERSATION"
-        - "FORWARD"
         - "FURTHER_STEPS"
         - "UPDATE_SESSION_DATA"
         - "VIDEOCALL"

src/main/java/de/caritas/cob/userservice/api/IdentityManager.java

@@ -14,10 +14,6 @@
 @RequiredArgsConstructor
 public class IdentityManager implements IdentityManaging {
 
-  private static final String VIEW_ALL_PEER_SESSIONS = "AUTHORIZATION_VIEW_ALL_PEER_SESSIONS";
-  private static final String VIEW_ALL_FEEDBACK_SESSIONS =
-      "AUTHORIZATION_VIEW_ALL_FEEDBACK_SESSIONS";
-
   private final IdentityClient identityClient;
 
   @Override
@@ -74,14 +70,4 @@ public boolean isEmailAvailableOrOwn(String username, String email) {
         || user.get("encodedUsername").equals(username)
         || user.get("decodedUsername").equals(username);
   }
-
-  @Override
-  public boolean canViewPeerSessions(String consultantId) {
-    return identityClient.userHasAuthority(consultantId, VIEW_ALL_PEER_SESSIONS);
-  }
-
-  @Override
-  public boolean canViewFeedbackSessions(String consultantId) {
-    return identityClient.userHasAuthority(consultantId, VIEW_ALL_FEEDBACK_SESSIONS);
-  }
 }

src/main/java/de/caritas/cob/userservice/api/Messenger.java

@@ -6,7 +6,6 @@
 import de.caritas.cob.userservice.api.model.Chat;
 import de.caritas.cob.userservice.api.model.Consultant;
 import de.caritas.cob.userservice.api.model.Session;
-import de.caritas.cob.userservice.api.port.in.IdentityManaging;
 import de.caritas.cob.userservice.api.port.in.Messaging;
 import de.caritas.cob.userservice.api.port.out.ChatRepository;
 import de.caritas.cob.userservice.api.port.out.ConsultantRepository;
@@ -37,7 +36,6 @@ public class Messenger implements Messaging {
   private final SessionRepository sessionRepository;
   private final UserServiceMapper mapper;
   private final StringConverter stringConverter;
-  private final IdentityManaging identityManager;
   private final AgencyService agencyService;
 
   @Override
@@ -141,17 +139,9 @@ public boolean removeUserFromSession(String chatUserId, String chatId) {
     var removedOrIgnored = new AtomicBoolean(true);
 
     if (!session.isAdvisedBy(consultant) && !isResponsible(session, consultant)) {
-      if (isInChat(chatId, chatUserId)
-          && !isTeaming(session, consultant)
-          && !isPeering(session, consultant)) {
+      if (isInChat(chatId, chatUserId)) {
         removedOrIgnored.set(messageClient.removeUserFromSession(chatUserId, chatId));
       }
-
-      var feedbackChatId = session.getFeedbackGroupId();
-      if (isInChat(feedbackChatId, chatUserId) && !isMain(consultant)) {
-        removedOrIgnored.compareAndExchange(
-            true, messageClient.removeUserFromSession(chatUserId, feedbackChatId));
-      }
     }
 
     return removedOrIgnored.get();
@@ -161,18 +151,6 @@ private boolean isResponsible(Session session, Consultant consultant) {
     return session.isTeamSession() && consultant.isInAgency(session.getAgencyId());
   }
 
-  private boolean isTeaming(Session session, Consultant consultant) {
-    return !session.hasFeedbackChat() && consultant.isTeamConsultant();
-  }
-
-  private boolean isPeering(Session session, Consultant consultant) {
-    return session.hasFeedbackChat() && identityManager.canViewPeerSessions(consultant.getId());
-  }
-
-  private boolean isMain(Consultant consultant) {
-    return identityManager.canViewFeedbackSessions(consultant.getId());
-  }
-
   public boolean isInChat(String chatId, String chatUserId) {
     if (isNull(chatId)) {
       return false;

src/main/java/de/caritas/cob/userservice/api/UserServiceMapper.java

@@ -80,9 +80,6 @@ public Map<String, Object> mapOf(Consultant consultant, Map<String, Object> addi
     map.put(
         "notifyNewChatMessageFromAdviceSeeker",
         consultant.getNotifyNewChatMessageFromAdviceSeeker());
-    map.put(
-        "notifyNewFeedbackMessageFromAdviceSeeker",
-        consultant.getNotifyNewFeedbackMessageFromAdviceSeeker());
     map.put("walkThroughEnabled", consultant.getWalkThroughEnabled());
     map.put("chatUserId", consultant.getRocketChatId());
     map.put("preferredLanguage", consultant.getLanguageCode().toString());
@@ -380,10 +377,6 @@ public Consultant consultantOf(Consultant consultant, Map<String, Object> patchM
       var notify = (Boolean) patchMap.get("notifyNewChatMessageFromAdviceSeeker");
       consultant.setNotifyNewChatMessageFromAdviceSeeker(notify);
     }
-    if (patchMap.containsKey("notifyNewFeedbackMessageFromAdviceSeeker")) {
-      var notify = (Boolean) patchMap.get("notifyNewFeedbackMessageFromAdviceSeeker");
-      consultant.setNotifyNewFeedbackMessageFromAdviceSeeker(notify);
-    }
     if (patchMap.containsKey("termsAndConditionsConfirmation")
         && (patchMap.get("termsAndConditionsConfirmation") instanceof Boolean)) {
       consultant.setTermsAndConditionsConfirmation(LocalDateTime.now());

src/main/java/de/caritas/cob/userservice/api/actions/session/SetRocketChatRoomReadOnlyActionCommand.java

@@ -28,7 +28,6 @@ public class SetRocketChatRoomReadOnlyActionCommand implements ActionCommand<Ses
   public void execute(Session session) {
     if (nonNull(session)) {
       setRoomReadOnly(session.getGroupId());
-      setRoomReadOnly(session.getFeedbackGroupId());
     }
   }
 

src/main/java/de/caritas/cob/userservice/api/adapters/web/controller/UserController.java

@@ -71,7 +71,6 @@
 import de.caritas.cob.userservice.api.facade.userdata.AskerDataProvider;
 import de.caritas.cob.userservice.api.facade.userdata.ConsultantDataFacade;
 import de.caritas.cob.userservice.api.facade.userdata.ConsultantDataProvider;
-import de.caritas.cob.userservice.api.facade.userdata.EmailNotificationMapper;
 import de.caritas.cob.userservice.api.facade.userdata.KeycloakUserDataProvider;
 import de.caritas.cob.userservice.api.helper.AuthenticatedUser;
 import de.caritas.cob.userservice.api.model.Chat;
@@ -174,8 +173,6 @@ public class UserController implements UsersApi {
 
   private final @NotNull AdminUserFacade adminUserFacade;
 
-  private final @NonNull EmailNotificationMapper emailNotificationMapper;
-
   @Value("${feature.topics.enabled}")
   private boolean featureTopicsEnabled;
 
@@ -340,13 +337,13 @@ public ResponseEntity<UserSessionListResponseDTO> getSessionsForAuthenticatedUse
 
   /**
    * Returns a list of sessions for the currently authenticated/logged in user and given RocketChat
-   * group, or feedback group IDs.
+   * group IDs.
    *
    * @param rcToken Rocket.Chat token (required)
    * @return {@link ResponseEntity} of {@link UserSessionListResponseDTO}
    */
   @Override
-  public ResponseEntity<GroupSessionListResponseDTO> getSessionsForGroupOrFeedbackGroupIds(
+  public ResponseEntity<GroupSessionListResponseDTO> getSessionsForGroupIds(
       @RequestHeader String rcToken, @RequestParam List<String> rcGroupIds) {
     GroupSessionListResponseDTO groupSessionList;
     if (authenticatedUser.isConsultant()) {
@@ -717,26 +714,6 @@ public ResponseEntity<Void> sendNewMessageNotification(
     return new ResponseEntity<>(HttpStatus.OK);
   }
 
-  /**
-   * Sends email notifications to the user(s) if there has been a new feedback answer. Uses the
-   * provided Keycloak authorization token for user verification (user role). This means that the
-   * user that wrote the answer should also call this method.
-   *
-   * @param newMessageNotificationDTO (required)
-   * @return {@link ResponseEntity} containing {@link HttpStatus}
-   */
-  @Override
-  public ResponseEntity<Void> sendNewFeedbackMessageNotification(
-      @RequestBody NewMessageNotificationDTO newMessageNotificationDTO) {
-
-    emailNotificationFacade.sendNewFeedbackMessageNotification(
-        newMessageNotificationDTO.getRcGroupId(),
-        authenticatedUser.getUserId(),
-        TenantContext.getCurrentTenantData());
-
-    return new ResponseEntity<>(HttpStatus.OK);
-  }
-
   /**
    * Sends email notification for reassign request to advice seeker if the property isConfirmed of
    * {@link ReassignmentNotificationDTO} is null or false. Send email confirmation notification to