feat: update slot operator controller (#61)

onecx · Apr 22, 2024 · cf09d80 · cf09d80
1 parent 93ef114
commit cf09d80
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 9 deletions.
diff --git a/src/main/java/org/tkit/onecx/product/store/domain/daos/SlotDAO.java b/src/main/java/org/tkit/onecx/product/store/domain/daos/SlotDAO.java
@@ -41,19 +41,20 @@ public PageResult<Slot> findByCriteria(SlotSearchCriteria criteria) {
         }
     }
 
-    public Slot findByProductNameAppId(String productName, String appId) {
+    public Slot findByProductNameAppId(String productName, String appId, String name) {
         try {
             var cb = this.getEntityManager().getCriteriaBuilder();
             var cq = cb.createQuery(Slot.class);
             var root = cq.from(Slot.class);
             cq.where(cb.and(
                     cb.equal(root.get(Slot_.APP_ID), appId),
+                    cb.equal(root.get(Slot_.NAME), name),
                     cb.equal(root.get(Slot_.PRODUCT_NAME), productName)));
             return this.getEntityManager().createQuery(cq).getSingleResult();
         } catch (NoResultException nre) {
             return null;
         } catch (Exception ex) {
-            throw new DAOException(ErrorKeys.ERROR_FIND_SLOT_PRODUCT_NAME_APP_ID, ex, appId);
+            throw new DAOException(ErrorKeys.ERROR_FIND_SLOT_PRODUCT_NAME_APP_ID_NAME, ex, appId);
         }
     }
 
@@ -98,7 +99,7 @@ public void deleteByProductName(String productName) {
     public enum ErrorKeys {
         ERROR_UPDATE_BY_PRODUCT_NAME,
         ERROR_DELETE_BY_PRODUCT_NAME,
-        ERROR_FIND_SLOT_PRODUCT_NAME_APP_ID,
+        ERROR_FIND_SLOT_PRODUCT_NAME_APP_ID_NAME,
         ERROR_FIND_SLOTS_BY_CRITERIA,
 
     }

diff --git a/...kit/onecx/product/store/rs/operator/slot/v1/controllers/OperatorSlotRestControllerV1.java b/...kit/onecx/product/store/rs/operator/slot/v1/controllers/OperatorSlotRestControllerV1.java
@@ -34,7 +34,7 @@ public class OperatorSlotRestControllerV1 implements OperatorSlotApi {
     @Override
     public Response createOrUpdateSlot(String productName, String appId,
             UpdateSlotRequestSlotDTOv1 updateSlotRequestSlotDTOv1) {
-        var ms = dao.findByProductNameAppId(productName, appId);
+        var ms = dao.findByProductNameAppId(productName, appId, updateSlotRequestSlotDTOv1.getName());
         if (ms == null) {
             ms = mapper.create(updateSlotRequestSlotDTOv1);
             ms.setAppId(appId);

diff --git a/src/main/openapi/onecx-product-store-operator-slot-v1.yaml b/src/main/openapi/onecx-product-store-operator-slot-v1.yaml
@@ -77,6 +77,8 @@ components:
           type: string
     UpdateSlotRequest:
       type: object
+      required:
+        - name
       properties:
         description:
           type: string

diff --git a/src/test/java/org/tkit/onecx/product/store/domain/daos/SlotDAOTest.java b/src/test/java/org/tkit/onecx/product/store/domain/daos/SlotDAOTest.java
@@ -28,8 +28,8 @@ void beforeAll() {
 
     @Test
     void methodExceptionTests() {
-        methodExceptionTests(() -> dao.findByProductNameAppId("test", "test"),
-                SlotDAO.ErrorKeys.ERROR_FIND_SLOT_PRODUCT_NAME_APP_ID);
+        methodExceptionTests(() -> dao.findByProductNameAppId("test", "test", "test"),
+                SlotDAO.ErrorKeys.ERROR_FIND_SLOT_PRODUCT_NAME_APP_ID_NAME);
         methodExceptionTests(() -> dao.findByCriteria(null),
                 SlotDAO.ErrorKeys.ERROR_FIND_SLOTS_BY_CRITERIA);
         methodExceptionTests(() -> dao.deleteByProductName(null),

diff --git a/...duct/store/rs/operator/slot/v1/controllers/OperatorSlotRestControllerV1ExceptionTest.java b/...duct/store/rs/operator/slot/v1/controllers/OperatorSlotRestControllerV1ExceptionTest.java
@@ -26,9 +26,9 @@ class OperatorSlotRestControllerV1ExceptionTest extends AbstractTest {
 
     @BeforeEach
     void beforeAll() {
-        Mockito.when(dao.findByProductNameAppId(any(), any()))
+        Mockito.when(dao.findByProductNameAppId(any(), any(), any()))
                 .thenThrow(new RuntimeException("Test technical error exception"))
-                .thenThrow(new DAOException(SlotDAO.ErrorKeys.ERROR_FIND_SLOT_PRODUCT_NAME_APP_ID,
+                .thenThrow(new DAOException(SlotDAO.ErrorKeys.ERROR_FIND_SLOT_PRODUCT_NAME_APP_ID_NAME,
                         new RuntimeException("Test")));
     }
 

diff --git a/...onecx/product/store/rs/operator/slot/v1/controllers/OperatorSlotRestControllerV1Test.java b/...onecx/product/store/rs/operator/slot/v1/controllers/OperatorSlotRestControllerV1Test.java
@@ -37,7 +37,7 @@ void createSlotTest() {
     @Test
     void updateSlotTest() {
         var dto = new UpdateSlotRequestSlotDTOv1();
-        dto.name("display-name");
+        dto.name("slot1");
         dto.description("description");
 
         given()