Merge pull request #113 from virtualidentityag/develop

tsys release

api/agencyadminservice.yaml

@@ -190,42 +190,40 @@ paths:
           description: INTERNAL SERVER ERROR - server encountered unexpected condition
       security:
         - Bearer: [ ]
-  /agencyadmin/dioceses:
+  /agencyadmin/agencies/tenant/{tenantId}:
     get:
       tags:
         - admin-agency-controller
-      summary: 'Returns the full list of dioceses [Authorization: Role: agency-admin]'
-      operationId: getDioceses
+      summary: 'Get an agency [Authorization: Roles: agency-admin and tenant-admin]'
+      operationId: getAgenciesByTenantId
       parameters:
-        - name: page
-          in: query
-          description: Number of page where to start in the query (1 = first page)
-          required: true
-          schema:
-            type: integer
-            example: 1
-        - name: perPage
-          in: query
-          description: Number of items which are being returned per page
+        - name: tenantId
+          in: path
+          description: Tenant ID
           required: true
           schema:
             type: integer
-            example: 20
+            format: int64
       responses:
         200:
-          description: OK - successfull operation
+          description: OK
           content:
-            'application/hal+json':
+            'application/json':
               schema:
-                $ref: '#/components/schemas/DioceseAdminResultDTO'
+                type: array
+                items:
+                  $ref: '#/components/schemas/AgencyAdminFullResponseDTO'
         400:
-          description: BAD REQUEST - invalid/incomplete request or body object
+          description: BAD REQUEST - invalid/incomplete request
         401:
           description: UNAUTHORIZED - no/invalid role/authorization
+        404:
+          description: NOT FOUND - agency with the provided tenant id does not exist
         500:
           description: INTERNAL SERVER ERROR - server encountered unexpected condition
       security:
         - Bearer: [ ]
+
   /agencyadmin/agencies/{agencyId}/changetype:
     post:
       tags:
@@ -412,8 +410,7 @@ components:
           $ref: '#/components/schemas/HalLink'
         agencypostcodes:
           $ref: '#/components/schemas/HalLink'
-        dioceses:
-          $ref: '#/components/schemas/HalLink'
+
 
     HalLink:
       type: object
@@ -466,12 +463,6 @@ components:
           minimum: 0
           maximum: 9223372036854775807
           example: 684
-        dioceseId:
-          type: integer
-          format: int64
-          minimum: 0
-          maximum: 9223372036854775807
-          example: 684
         name:
           type: string
           maxLength: 100
@@ -526,6 +517,56 @@ components:
           items:
             type: string
             enum: [ RELATIVE_COUNSELLING, SELF_COUNSELLING, PARENTAL_COUNSELLING ]
+        tenantId:
+          type: integer
+          format: int64
+          example: 12
+        dataProtection:
+          type: object
+          $ref: '#/components/schemas/DataProtectionDTO'
+
+    DataProtectionDTO:
+        type: object
+        properties:
+          dataProtectionResponsibleEntity:
+            type: string
+            enum: [ AGENCY_RESPONSIBLE, ALTERNATIVE_REPRESENTATIVE, DATA_PROTECTION_OFFICER ]
+          agencyDataProtectionResponsibleContact:
+            type: object
+            $ref: '#/components/schemas/DataProtectionContactDTO'
+          alternativeDataProtectionRepresentativeContact:
+            type: object
+            $ref: '#/components/schemas/DataProtectionContactDTO'
+          dataProtectionOfficerContact:
+            type: object
+            $ref: '#/components/schemas/DataProtectionContactDTO'
+
+    DataProtectionContactDTO:
+        type: object
+        properties:
+          nameAndLegalForm:
+            type: string
+            example: "Max Mustermann"
+          street:
+            type: string
+            maxLength: 100
+            example: "Musterstraße 1"
+          postcode:
+            type: string
+            minLength: 5
+            maxLength: 5
+            example: "79106"
+          city:
+            type: string
+            maxLength: 100
+            example: "Freiburg"
+          phoneNumber:
+            type: string
+            maxLength: 100
+            example: "0761 123456"
+          email:
+            type: string
+            maxLength: 100
 
 
     PostcodeRangeDTO:
@@ -535,53 +576,14 @@ components:
           type: string
           example: "79106-79386;88682;97051-97111"
 
-    DioceseAdminResultDTO:
-      type: object
-      properties:
-        _embedded:
-          type: array
-          items:
-            $ref: '#/components/schemas/DioceseResponseDTO'
-        _links:
-          $ref: '#/components/schemas/PaginationLinks'
-        total:
-          type: integer
-
-    DioceseResponseDTO:
-      type: object
-      properties:
-        id:
-          type: integer
-          format: int64
-          minimum: 0
-          maximum: 9223372036854775807
-          example: 12
-        name:
-          type: string
-          maxLength: 100
-          example: "Freiburg"
-        createDate:
-          type: string
-          example: "2019-08-23T08:52:05"
-        updateDate:
-          type: string
-          example: "2019-12-02T13:12:08"
-
     AgencyDTO:
       type: object
       required:
-        - dioceseId
         - name
         - teamAgency
         - consultingType
         - external
       properties:
-        dioceseId:
-          type: integer
-          format: int64
-          minimum: 0
-          maximum: 9223372036854775807
-          example: 12
         name:
           type: string
           maxLength: 100
@@ -605,7 +607,6 @@ components:
         consultingType:
           type: integer
           minimum: 0
-          maximum: 127
           example: 1
         url:
           type: string
@@ -641,17 +642,10 @@ components:
     UpdateAgencyDTO:
       type: object
       required:
-        - dioceseId
         - name
         - offline
         - external
       properties:
-        dioceseId:
-          type: integer
-          format: int64
-          minimum: 0
-          maximum: 9223372036854775807
-          example: 12
         name:
           type: string
           example: "Beratungsstelle"

api/agencyservice.yaml

@@ -172,6 +172,9 @@ components:
           type: integer
           format: int64
           example: 12
+        agencySpecificPrivacy:
+          type: string
+          example: "specific for agency privacy text"
 
     FullAgencyResponseDTO:
       type: object

pom.xml

@@ -31,13 +31,13 @@
     <jackson-databind-nullable.version>0.2.3</jackson-databind-nullable.version>
     <javax.ws.rs-api.version>2.1.1</javax.ws.rs-api.version>
     <commons-lang3.version>3.11</commons-lang3.version>
-    <liquibase-maven-plugin.version>4.1.1</liquibase-maven-plugin.version>
+    <liquibase-maven-plugin.version>4.23.2</liquibase-maven-plugin.version>
     <h2.version>1.4.200</h2.version>
     <powermock-module-junit4.version>2.0.9</powermock-module-junit4.version>
     <ehcache.version>2.10.6</ehcache.version>
     <easy-random-core.version>5.0.0</easy-random-core.version>
     <spring-boot-autoconfigure.version>3.0.6</spring-boot-autoconfigure.version>
-    <liquibase-core.version>4.9.1</liquibase-core.version>
+    <liquibase-core.version>4.23.2</liquibase-core.version>
     <springfox-boot-starter.version>3.0.0</springfox-boot-starter.version>
     <spring-security.version>6.0.5</spring-security.version>
     <springfox.version>2.9.2</springfox.version>
@@ -83,6 +83,10 @@
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-autoconfigure</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-freemarker</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-web</artifactId>
@@ -198,8 +202,21 @@
       <groupId>org.liquibase</groupId>
       <artifactId>liquibase-maven-plugin</artifactId>
       <version>${liquibase-maven-plugin.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.liquibase</groupId>
+          <artifactId>liquibase-core</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>org.liquibase</groupId>
+      <artifactId>liquibase-core</artifactId>
+      <version>${liquibase-core.version}</version>
     </dependency>
 
+
     <dependency>
       <groupId>org.apache.httpcomponents.client5</groupId>
       <artifactId>httpclient5</artifactId>

services/applicationsettingsservice.yml

@@ -28,7 +28,33 @@ paths:
           description: UNAUTHORIZED - no/invalid Keycloak token
         500:
           description: INTERNAL SERVER ERROR - server encountered unexpected condition
+  /settingsadmin:
+    patch:
+      tags:
+        - applicationsettings-controller
+      summary: 'Patch application settings'
+      operationId: patchApplicationSettings
+      requestBody:
+        content:
+          'application/json':
+            schema:
+              $ref: '#/components/schemas/ApplicationSettingsPatchDTO'
+      responses:
+        200:
+          description: OK - successful operation
 
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ApplicationSettingsDTO'
+        204:
+          description: NO CONTENT - no content found
+        400:
+          description: BAD REQUEST - invalid/incomplete request or body object
+        401:
+          description: UNAUTHORIZED - no/invalid Keycloak token
+        500:
+          description: INTERNAL SERVER ERROR - server encountered unexpected condition
 components:
   schemas:
     ApplicationSettingsDTO:
@@ -55,14 +81,41 @@ components:
         mainTenantSubdomainForSingleDomainMultitenancy:
           allOf:
             - $ref: '#/components/schemas/SettingDTO'
-        budibaseSSO:
+        useOverviewPage:
           allOf:
             - $ref: '#/components/schemas/FeatureToggleDTO'
-        useOverviewPage:
+        calcomUrl:
+          allOf:
+            - $ref: '#/components/schemas/SettingDTO'
+        budibaseAuthClientId:
+          allOf:
+            - $ref: '#/components/schemas/SettingDTO'
+        budibaseUrl:
+          allOf:
+            - $ref: '#/components/schemas/SettingDTO'
+        calendarAppUrl:
+          allOf:
+            - $ref: '#/components/schemas/SettingDTO'
+        legalContentChangesBySingleTenantAdminsAllowed:
+          allOf:
+            - $ref: '#/components/schemas/FeatureToggleDTO'
+        documentationEnabled:
           allOf:
             - $ref: '#/components/schemas/FeatureToggleDTO'
+        releaseToggles:
+          type: object
+          additionalProperties:
+            type: object
 
 
+    ApplicationSettingsPatchDTO:
+      type: object
+      properties:
+        legalContentChangesBySingleTenantAdminsAllowed:
+          type: boolean
+        mainTenantSubdomainForSingleDomainMultitenancy:
+          type: string
+
     FeatureToggleDTO:
       type: object
       required: