Merge pull request #26 from CaritasDeutschland/feature-make-video-con…

…figurable Feature make video configurable
Onlineberatung · Nov 11, 2021 · ed917d8 · ed917d8
2 parents a4268ae + bcf31f1
commit ed917d8
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 6 deletions.
diff --git a/api/consultingtypeservice.yml b/api/consultingtypeservice.yml
@@ -191,6 +191,9 @@ components:
         showAskerProfile:
           type: boolean
           example: true
+        isVideoCallAllowed:
+          type: boolean
+          example: true
 
     ExtendedConsultingTypeResponseDTO:
       type: object

diff --git a/consulting-type-settings/consulting-type-0.json b/consulting-type-settings/consulting-type-0.json
@@ -19,6 +19,7 @@
   "sendFurtherStepsMessage": true,
   "sendSaveSessionDataMessage": true,
   "isSetEmailAllowed": false,
+  "isVideoCallAllowed": false,
   "sessionDataInitializing": {
     "addictiveDrugs": true,
     "age": true,

diff --git a/consulting-type-settings/consulting-type-1.json b/consulting-type-settings/consulting-type-1.json
@@ -1,14 +1,12 @@
 {
   "id": 1,
-  "groups": [
-    "group2"
-  ],
   "slug": "consultingtype1",
   "excludeNonMainConsultantsFromTeamSessions": false,
   "consultantBoundedToConsultingType": false,
   "sendSaveSessionDataMessage": true,
   "initializeFeedbackChat": true,
   "isPeer": true,
+  "isVideoCallAllowed": false,
   "languageFormal": true,
   "roles": {
     "consultant": {

diff --git a/src/main/java/de/caritas/cob/consultingtypeservice/api/mapper/BasicConsultingTypeMapper.java b/src/main/java/de/caritas/cob/consultingtypeservice/api/mapper/BasicConsultingTypeMapper.java
@@ -26,7 +26,8 @@ public static BasicConsultingTypeResponseDTO mapConsultingType(ConsultingType co
         .urls(mapUrls(consultingType.getUrls()))
         .registration(mapRegistration(consultingType.getRegistration()))
         .groupChat(mapGroupChat(consultingType.getGroupChat()))
-        .showAskerProfile(consultingType.getShowAskerProfile());
+        .showAskerProfile(consultingType.getShowAskerProfile())
+        .isVideoCallAllowed(consultingType.getIsVideoCallAllowed());
   }
 
 }
diff --git a/...in/java/de/caritas/cob/consultingtypeservice/api/mapper/ExtendedConsultingTypeMapper.java b/...in/java/de/caritas/cob/consultingtypeservice/api/mapper/ExtendedConsultingTypeMapper.java
@@ -43,6 +43,7 @@ public static ExtendedConsultingTypeResponseDTO mapConsultingType(ConsultingType
         .monitoring(mapMonitoring(consultingType.getMonitoring()))
         .roles(mapRoles(consultingType.getRoles()))
         .notifications(mapNotifications(consultingType.getNotifications()))
-        .showAskerProfile(consultingType.getShowAskerProfile());
+        .showAskerProfile(consultingType.getShowAskerProfile())
+        .isVideoCallAllowed(consultingType.getIsVideoCallAllowed());
   }
 }
diff --git a/src/main/java/de/caritas/cob/consultingtypeservice/api/mapper/FullConsultingTypeMapper.java b/src/main/java/de/caritas/cob/consultingtypeservice/api/mapper/FullConsultingTypeMapper.java
@@ -46,6 +46,7 @@ public static FullConsultingTypeResponseDTO mapConsultingType(ConsultingType con
         .notifications(mapNotifications(consultingType.getNotifications()))
         .voluntaryComponents(consultingType.getVoluntaryComponents())
         .requiredComponents(consultingType.getRequiredComponents())
-        .welcomeScreen(mapWelcomeScreen(consultingType.getWelcomeScreen()));
+        .welcomeScreen(mapWelcomeScreen(consultingType.getWelcomeScreen()))
+        .isVideoCallAllowed(consultingType.getIsVideoCallAllowed());
   }
 }
diff --git a/src/main/resources/schemas/consulting-type.json b/src/main/resources/schemas/consulting-type.json
@@ -522,6 +522,11 @@
       "type": "boolean",
       "default": true
     },
+    "isVideoCallAllowed": {
+      "description": "True to enable video call buttons for consultants. False, when video call should be deactivated for consulting type.",
+      "type": "boolean",
+      "default": false
+    },
     "isSubsequentRegistrationAllowed": {
       "description": "If true, askers additionally can register for this consulting type on their profile page at a later date.",
       "type": "boolean",

diff --git a/src/test/resources/consulting-type-settings/consulting-type-0.json b/src/test/resources/consulting-type-settings/consulting-type-0.json
@@ -15,6 +15,7 @@
   "isAnonymousConversationAllowed": false,
   "lockedAgencies": true,
   "showAskerProfile": false,
+  "isVideoCallAllowed": false,
   "welcomeMessage": {
     "sendWelcomeMessage": true,
     "welcomeMessageText": "Lorem ipsum"

diff --git a/src/test/resources/consulting-type-settings/consulting-type-1.json b/src/test/resources/consulting-type-settings/consulting-type-1.json
@@ -11,6 +11,7 @@
   "sendSaveSessionDataMessage": true,
   "initializeFeedbackChat": true,
   "isPeerChat": true,
+  "isVideoCallAllowed": false,
   "languageFormal": true,
   "roles": {
     "consultant": {

diff --git a/src/test/resources/consulting-type-settings/consulting-type-2.json b/src/test/resources/consulting-type-settings/consulting-type-2.json
@@ -13,6 +13,7 @@
   "sendSaveSessionDataMessage": true,
   "initializeFeedbackChat": true,
   "isPeerChat": true,
+  "isVideoCallAllowed": false,
   "languageFormal": true,
   "roles": {
     "consultant": {

diff --git a/src/test/resources/consulting-type-settings/consulting-type-3.json b/src/test/resources/consulting-type-settings/consulting-type-3.json
@@ -6,6 +6,7 @@
   "sendSaveSessionDataMessage": true,
   "initializeFeedbackChat": true,
   "isPeerChat": true,
+  "isVideoCallAllowed": false,
   "languageFormal": true,
   "roles": {
     "consultant": {

diff --git a/src/test/resources/consulting-type-settings/null-value-consulting-type-settings.json b/src/test/resources/consulting-type-settings/null-value-consulting-type-settings.json
@@ -12,6 +12,7 @@
   "sendSaveSessionDataMessage": false,
   "isSetEmailAllowed": true,
   "showAskerProfile": true,
+  "isVideoCallAllowed": true,
   "isSubsequentRegistrationAllowed": true,
   "isAnonymousConversationAllowed": true,
   "sessionDataInitializing": {