Add constraints on WorkspaceCreateRequest, WorkspaceUpdateRequest

Author: jreynard-code

organization/src/main/kotlin/com/cosmotech/organization/service/OrganizationServiceImpl.kt

@@ -111,8 +111,9 @@ class OrganizationServiceImpl(
     val existingOrganization = getVerifiedOrganization(organizationId, PERMISSION_WRITE)
     var hasChanged = false
 
-    if (organizationUpdateRequest.name != existingOrganization.name) {
-      existingOrganization.name = organizationUpdateRequest.name
+    if (!organizationUpdateRequest.name.isNullOrEmpty()
+      && organizationUpdateRequest.name != existingOrganization.name) {
+      existingOrganization.name = organizationUpdateRequest.name!!
       hasChanged = true
     }
 

workspace/src/main/openapi/workspace.yaml

@@ -674,21 +674,27 @@ components:
           x-field-extra-annotation: "@org.springframework.data.annotation.Id"
           readOnly: true
           description: Workspace unique identifier generated by the API
+          pattern: '^w-\w{10,20}'
           example: "w-0123456789ab"
         organizationId:
           x-field-extra-annotation: "@com.redis.om.spring.annotations.Indexed"
           type: string
           readOnly: true
           description: Organization unique identifier under which the workspace resides
+          pattern: '^o-\w{10,20}'
           example: "o-0123456789ab"
         key:
           type: string
           description: technical key for resource name convention and version grouping. Must be unique
+          minLength: 1
+          maxLength: 50
           example: "MyKey"
         name:
           type: string
           x-field-extra-annotation: "@com.redis.om.spring.annotations.Searchable"
           description: Workspace name. This name is display in the sample webApp
+          minLength: 1
+          maxLength: 50
           example: "FranceOffice"
         description:
           type: string
@@ -741,10 +747,14 @@ components:
         key:
           type: string
           description: technical key for resource name convention and version grouping. Must be unique
+          minLength: 1
+          maxLength: 50
         name:
           type: string
           description: Workspace name. This name is display in the sample webApp
           example: "FranceOffice"
+          minLength: 1
+          maxLength: 50
         description:
           type: string
           description: the Workspace description
@@ -779,9 +789,13 @@ components:
         key:
           type: string
           description: technical key for resource name convention and version grouping. Must be unique
+          minLength: 1
+          maxLength: 50
         name:
           type: string
           description: Workspace name
+          minLength: 1
+          maxLength: 50
         description:
           type: string
           description: the Workspace description
@@ -894,6 +908,7 @@ components:
         solutionId:
           type: string
           description: the Solution Id attached to this workspace
+          pattern: '^sol-\w{10,20}'
         runTemplateFilter:
           type: array
           description: the list of Solution Run Template Id to filter

workspace/src/test/kotlin/com/cosmotech/workspace/service/WorkspaceServiceImplTests.kt

@@ -67,8 +67,8 @@ import org.junit.jupiter.api.extension.ExtendWith
 import org.springframework.core.io.Resource
 import org.springframework.data.repository.findByIdOrNull
 
-const val ORGANIZATION_ID = "O-AbCdEf123"
-const val WORKSPACE_ID = "W-BcDeFg123"
+const val ORGANIZATION_ID = "o-AbCdEf1234"
+const val WORKSPACE_ID = "w-BcDeFg1234"
 const val CONNECTED_ADMIN_USER = "[email protected]"
 const val CONNECTED_DEFAULT_USER = "[email protected]"