Fixed api generation with tags

folio-org · Aug 28, 2024 · 5bd6c2a · 5bd6c2a
1 parent 5e9596a
commit 5bd6c2a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -583,6 +583,7 @@
               <configOptions>
                 <dateLibrary>java</dateLibrary>
                 <interfaceOnly>true</interfaceOnly>
+                <useTags>true</useTags>
                 <useSpringBoot3>true</useSpringBoot3>
               </configOptions>
             </configuration>

diff --git a/src/main/java/org/folio/consortia/controller/SharingRoleCapabilitySetController.java b/src/main/java/org/folio/consortia/controller/SharingRoleCapabilitySetController.java
@@ -4,12 +4,11 @@
 import static org.springframework.http.HttpStatus.OK;
 
 import java.util.UUID;
-
 import lombok.RequiredArgsConstructor;
 import org.folio.consortia.domain.dto.SharingRoleCapabilitySetDeleteResponse;
 import org.folio.consortia.domain.dto.SharingRoleCapabilitySetRequest;
+import org.folio.consortia.rest.resource.RoleCapabilitySetApi;
 import org.folio.consortia.domain.dto.SharingRoleCapabilitySetResponse;
-import org.folio.consortia.rest.resource.RolesApi;
 import org.folio.consortia.service.impl.SharingRoleCapabilitySetService;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -18,7 +17,7 @@
 @RestController
 @RequestMapping("/consortia/{consortiumId}/sharing")
 @RequiredArgsConstructor
-public class SharingRoleCapabilitySetController implements RolesApi {
+public class SharingRoleCapabilitySetController implements RoleCapabilitySetApi {
 
   private final SharingRoleCapabilitySetService sharingRoleCapabilitySetService;
 

diff --git a/src/main/java/org/folio/consortia/repository/SharingRoleRepository.java b/src/main/java/org/folio/consortia/repository/SharingRoleRepository.java
@@ -21,13 +21,9 @@ public interface SharingRoleRepository extends JpaRepository<SharingRoleEntity,
   Set<String> findTenantsByRoleId(UUID roleId);
 
   @Query("SELECT sr.tenantId FROM SharingRoleEntity sr " +
-    "WHERE sr.roleId = ?1 AND sr.is_capability_sets_shared = true")
+    "WHERE sr.roleId = ?1 AND sr.isCapabilitySetsShared = true")
   Set<String> findTenantsByRoleIdAndSharedCapabilitySets(UUID roleId);
 
-  @Query("SELECT sr.tenantId FROM SharingRoleEntity sr " +
-    "WHERE sr.roleId = ?1 AND sr.is_capabilities_shared = true")
-  Set<String> findTenantsByRoleIdAndSharedCapabilities(UUID roleId);
-
   boolean existsByRoleId(UUID roleId);
 
   @Modifying

diff --git a/src/main/resources/swagger.api/sharing_roles.yaml b/src/main/resources/swagger.api/sharing_roles.yaml
@@ -10,6 +10,8 @@ paths:
     post:
       summary: start sharing role
       operationId: startSharingRole
+      tags:
+        - roles
       parameters:
         - $ref: "#/components/parameters/consortiumId"
       requestBody:
@@ -32,6 +34,8 @@ paths:
     delete:
       summary: delete sharing role
       operationId: deleteSharingRole
+      tags:
+        - roles
       parameters:
         - $ref: "#/components/parameters/consortiumId"
         - $ref: "#/components/parameters/roleId"
@@ -55,6 +59,8 @@ paths:
     post:
       summary: start sharing role
       operationId: startSharingRoleCapabilitySet
+      tags:
+        - role-capability-set
       parameters:
         - $ref: "#/components/parameters/consortiumId"
       requestBody:
@@ -77,6 +83,8 @@ paths:
     delete:
       summary: delete sharing role capability set
       operationId: deleteSharingRoleCapabilitySet
+      tags:
+        - role-capability-set
       parameters:
         - $ref: "#/components/parameters/consortiumId"
         - $ref: "#/components/parameters/roleId"