[pull] develop from Onlineberatung:develop

.github/workflows/dockerImage.yml

@@ -64,7 +64,7 @@ jobs:
   push_to_registry:
     strategy:
       matrix:
-        registry: ["docker.pkg.github.com", "ghcr.io"]
+        registry: ["ghcr.io"]
     needs: [test]
     name: Push Docker image to GitHub Packages
     runs-on: ubuntu-latest

api/statisticsservice.yaml

@@ -109,6 +109,7 @@ components:
       enum:
         - "ASSIGN_SESSION"
         - "ARCHIVE_SESSION"
+        - "DELETE_ACCOUNT"
         - "CREATE_MESSAGE"
         - "START_VIDEO_CALL"
         - "STOP_VIDEO_CALL"
@@ -165,7 +166,7 @@ components:
           description: The id of the session
           example: 12345
 
-    ArchiveSessionStatisticsEventMessage:
+    ArchiveOrDeleteSessionStatisticsEventMessage:
       type: object
       required:
         - sessionId
@@ -188,6 +189,28 @@ components:
           type: string
           example: '2022-08-15T21:11:29'
 
+    DeleteAccountStatisticsEventMessage:
+      type: object
+      required:
+        - sessionId
+        - endDate
+      allOf:
+        - $ref: '#/components/schemas/StatisticsEventMessage'
+        - type: object
+      properties:
+        tenantId:
+          type: integer
+          format: int64
+          description: The id of the tenant
+          example: 1
+        userId:
+          type: string
+          description: The keycloak id of the consultant
+          example: d63f4cc0-215d-40e2-a866-2d3e910f0590
+        deleteDate:
+          type: string
+          example: '2022-08-15T21:11:29'
+
     CreateMessageStatisticsEventMessage:
       type: object
       required:
@@ -205,6 +228,14 @@ components:
           type: boolean
           description: indicates whether the message has an attachment
           example: true
+        receiverId:
+          type: string
+          description: receiving user id of the message (taken from session). Can be null for groupchat.
+        tenantId:
+          type: integer
+          format: int64
+          description: The id of the tenant
+          example: 1
 
     StartVideoCallStatisticsEventMessage:
       type: object
@@ -220,10 +251,17 @@ components:
           format: int64
           description: The id of the session
           example: 12345
+        adviceSeekerId:
+          type: string
+          description: The id of the adviceseeker
         videoCallUuid:
           type: string
           description: The uuid of the video call
           example: 123e4567-e89b-12d3-a456-556642440000
+        tenantId:
+          type: integer
+          format: int64
+          description: The id of the tenant
 
     StopVideoCallStatisticsEventMessage:
       type: object
@@ -258,6 +296,9 @@ components:
           format: int64
           description: The id of the tenant
           example: 1
+        tenantName:
+          type: string
+          example: 'Tenant name'
         registrationDate:
           type: string
           example: '2022-08-15T21:11:29'
@@ -281,6 +322,12 @@ components:
         postalCode:
           type: string
           example: '99999'
+        agencyName:
+          type: string
+          example: "Dortmund Beratungstelle"
+        referer:
+          type: string
+          example: "referer"
 
     RegistrationStatisticsListResponseDTO:
       type: object
@@ -324,6 +371,25 @@ components:
         postalCode:
           type: string
           example: '99999'
+        tenantName:
+          type: string
+          example: 'Tenant name'
+        agencyName:
+          type: string
+          example: "Dortmund Beratungstelle"
+        referer:
+          type: string
+          example: "referer"
+        appointmentsBookedCount:
+          type: integer
+          example: "4"
+        attendedVideoCallsCount:
+          type: integer
+          example: "6"
+        consultantMessagesCount:
+          type: integer
+          example: "72"
+          description: "Total number of messages sent by all consultants to this adviceseeker"
 
     BookingCreatedStatisticsEventMessage:
       type: object
@@ -343,6 +409,12 @@ components:
           type: string
         bookingId:
           type: integer
+        adviceSeekerId:
+          type: string
+        tenantId:
+          type: integer
+          format: int64
+          description: The id of the tenant
 
     BookingRescheduledStatisticsEventMessage:
       type: object

pom.xml

@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>2.5.12</version>
+    <version>2.7.18</version>
     <relativePath/> <!-- lookup parent from repository -->
   </parent>
 
@@ -30,7 +30,7 @@
     <openapi-generator-maven.version>6.2.1</openapi-generator-maven.version>
     <springfox-boot-starter.version>3.0.0</springfox-boot-starter.version>
     <spring-data-mongodb.version>3.3.5</spring-data-mongodb.version>
-    <spring-security.version>5.7.5</spring-security.version>
+    <spring-security.version>5.7.12</spring-security.version>
     <ehcache.version>2.10.9.2</ehcache.version>
   </properties>
 
@@ -64,6 +64,7 @@
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-data-mongodb</artifactId>
+      <version>2.7.5</version>
     </dependency>
     <dependency>
       <groupId>org.springframework.data</groupId>
@@ -73,7 +74,6 @@
     <dependency>
       <groupId>org.hibernate.validator</groupId>
       <artifactId>hibernate-validator</artifactId>
-      <version>6.1.6.Final</version>
     </dependency>
 
     <!-- OpenApi/Swagger dependencies -->
@@ -104,13 +104,6 @@
       <version>4.3.1</version>
     </dependency>
 
-    <!-- SpringFox: generate YAML file from POJOs and generate documentation -->
-    <dependency>
-      <groupId>io.springfox</groupId>
-      <artifactId>springfox-boot-starter</artifactId>
-      <version>${springfox-boot-starter.version}</version>
-    </dependency>
-
     <!-- Keycloak dependencies -->
     <dependency>
       <groupId>org.keycloak</groupId>
@@ -150,7 +143,6 @@
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
-      <version>3.11</version>
     </dependency>
 
     <dependency>
@@ -168,7 +160,6 @@
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-autoconfigure</artifactId>
-      <version>2.3.5.RELEASE</version>
     </dependency>
 
     <dependency>
@@ -195,23 +186,23 @@
       <exclusions>
       </exclusions>
     </dependency>
+
     <dependency>
-      <artifactId>powermock-module-junit4</artifactId>
-      <groupId>org.powermock</groupId>
+      <groupId>de.flapdoodle.embed</groupId>
+      <artifactId>de.flapdoodle.embed.mongo</artifactId>
+      <version>4.13.0</version>
       <scope>test</scope>
-      <version>2.0.2</version>
     </dependency>
     <dependency>
-      <artifactId>powermock-api-mockito2</artifactId>
-      <groupId>org.powermock</groupId>
-      <scope>test</scope>
-      <version>2.0.2</version>
+      <groupId>de.flapdoodle.embed</groupId>
+      <artifactId>de.flapdoodle.embed.mongo.spring26x</artifactId>
+      <version>4.13.0</version>
     </dependency>
 
     <dependency>
-      <groupId>de.flapdoodle.embed</groupId>
-      <artifactId>de.flapdoodle.embed.mongo</artifactId>
-      <scope>test</scope>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>2.16.1</version>
     </dependency>
 
     <!-- EasyRandom -->
@@ -237,6 +228,24 @@
         <artifactId>spring-boot-maven-plugin</artifactId>
       </plugin>
 
+      <plugin>
+        <groupId>org.openrewrite.maven</groupId>
+        <artifactId>rewrite-maven-plugin</artifactId>
+        <version>5.30.0</version>
+        <configuration>
+          <activeRecipes>
+            <recipe>org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_7</recipe>
+          </activeRecipes>
+        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>org.openrewrite.recipe</groupId>
+            <artifactId>rewrite-spring</artifactId>
+            <version>5.9.0</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+
       <!-- OpenApi codegen maven plugin: generates api stubs -->
       <plugin>
         <groupId>org.openapitools</groupId>

src/main/java/de/caritas/cob/statisticsservice/StatisticsServiceApplication.java

@@ -6,7 +6,6 @@
 
 @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
 public class StatisticsServiceApplication {
-
   public static void main(String[] args) {
     SpringApplication.run(StatisticsServiceApplication.class, args);
   }