polishing the workspace migration

src/main/java/zw/qantra/tm/domain/controllers/RecipientGroupController.java

@@ -25,7 +25,7 @@ import java.util.List;
 import java.util.UUID;
 
 @RestController
-@RequestMapping("/public/recipient-groups")
+@RequestMapping("/recipient-groups")
 @RequiredArgsConstructor
 public class RecipientGroupController {
     private final RecipientGroupService recipientGroupService;
@@ -34,7 +34,7 @@ public class RecipientGroupController {
     public ResponseEntity findAll(
             @And({
                     @Spec(path = "name", spec = EqualIgnoreCase.class),
-                    @Spec(path = "userId", defaultVal = "null", spec = Equal.class)
+                    @Spec(path = "workspaceId", defaultVal = "null", spec = Equal.class)
             })Specification<RecipientGroup> spec, Pageable pageable) {
         return ResponseEntity.ok(recipientGroupService.findAll(spec, pageable));
     }
@@ -44,6 +44,7 @@ public class RecipientGroupController {
         RecipientGroup group = RecipientGroup.builder()
                 .name(request.getName())
                 .description(request.getDescription())
+                .workspaceId(request.getWorkspaceId())
                 .userId(request.getUserId())
                 .build();
         return ResponseEntity.ok(recipientGroupService.create(group, request.getRecipients()));
@@ -56,7 +57,7 @@ public class RecipientGroupController {
             @RequestParam(value = "description", required = false) String description,
             @RequestParam(value = "requestedBy", required = false) String requestedBy,
             @RequestParam(value = "currency", required = false) String currency,
-            @RequestParam("userId") String userId) {
+            @RequestParam("workspaceId") UUID workspaceId) {
 
         GroupCreateFromFileRequest request = new GroupCreateFromFileRequest();
         request.setGroupName(groupName.trim());
@@ -64,7 +65,7 @@ public class RecipientGroupController {
         request.setRequestedBy(requestedBy);
         request.setCurrency(currency);
 
-        return ResponseEntity.ok(recipientGroupService.createFromFile(file, request, userId));
+        return ResponseEntity.ok(recipientGroupService.createFromFile(file, request, workspaceId));
     }
 
     @PutMapping("/update/{groupId}")
@@ -72,15 +73,15 @@ public class RecipientGroupController {
                                                  @RequestBody RecipientGroupUpdateRequest request) {
         return ResponseEntity.ok(recipientGroupService.update(
                 groupId,
-                request.getUserId(),
+                request.getWorkspaceId(),
                 request.getName(),
                 request.getDescription()));
     }
 
     @DeleteMapping("/delete/{groupId}")
     public ResponseEntity<Void> delete(@PathVariable UUID groupId,
-                                       @RequestParam String userId) {
-        recipientGroupService.delete(groupId, userId);
+                                       @RequestParam UUID workspaceId) {
+        recipientGroupService.delete(groupId, workspaceId);
         return ResponseEntity.noContent().build();
     }
 
@@ -89,15 +90,15 @@ public class RecipientGroupController {
                                                                        @RequestBody GroupMemberRequest request) {
         return ResponseEntity.ok(recipientGroupService.addMembersByIds(
                 groupId,
-                request.getUserId(),
+                request.getWorkspaceId(),
                 request.getRecipientIds()));
     }
 
     @DeleteMapping("/{groupId}/members/{recipientId}")
     public ResponseEntity<Void> removeMember(@PathVariable UUID groupId,
                                              @PathVariable UUID recipientId,
-                                             @RequestParam String userId) {
-        recipientGroupService.removeMember(groupId, recipientId, userId);
+                                              @RequestParam UUID workspaceId) {
+        recipientGroupService.removeMember(groupId, recipientId, workspaceId);
         return ResponseEntity.noContent().build();
     }