feat: add has-video-calls setting to agency

api/agencyadminservice.yaml

@@ -522,6 +522,9 @@ components:
         deleteDate:
           type: string
           example: "2020-09-02T15:53:23"
+        hasVideoCalls:
+          type: boolean
+          nullable: false
 
     PostcodeRangeDTO:
       type: object
@@ -619,7 +622,9 @@ components:
           type: integer
           format: int64
           example: 12
-
+        hasVideoCalls:
+          type: boolean
+          default: true
 
     AgencyAdminFullResponseDTO:
       type: object
@@ -682,6 +687,9 @@ components:
             type: long
         demographics:
           $ref: '#/components/schemas/DemographicsDTO'
+        hasVideoCalls:
+          type: boolean
+          default: true
 
     DemographicsDTO:
       type: object

api/agencyservice.yaml

@@ -165,6 +165,9 @@ components:
           type: integer
           format: int64
           example: 12
+        hasVideoCalls:
+          type: boolean
+          default: true
 
     FullAgencyResponseDTO:
       type: object

src/main/java/de/caritas/cob/agencyservice/api/admin/service/AgencyAdminService.java

@@ -3,6 +3,7 @@
 import static de.caritas.cob.agencyservice.api.exception.httpresponses.HttpStatusExceptionReason.AGENCY_IS_ALREADY_DEFAULT_AGENCY;
 import static de.caritas.cob.agencyservice.api.exception.httpresponses.HttpStatusExceptionReason.AGENCY_IS_ALREADY_TEAM_AGENCY;
 import static de.caritas.cob.agencyservice.api.model.AgencyTypeRequestDTO.AgencyTypeEnum.TEAM_AGENCY;
+import static java.util.Objects.isNull;
 import static java.util.Objects.nonNull;
 
 import de.caritas.cob.agencyservice.api.admin.service.agency.AgencyAdminFullResponseDTOBuilder;
@@ -104,6 +105,7 @@ public AgencyAdminFullResponseDTO createAgency(AgencyDTO agencyDTO) {
    * @return an {@link Agency} instance
    */
   private Agency fromAgencyDTO(AgencyDTO agencyDTO) {
+    var hasVideoCalls = agencyDTO.getHasVideoCalls();
 
     var agencyBuilder = Agency.builder()
         .dioceseId(agencyDTO.getDioceseId())
@@ -116,6 +118,7 @@ private Agency fromAgencyDTO(AgencyDTO agencyDTO) {
         .consultingTypeId(agencyDTO.getConsultingType())
         .url(agencyDTO.getUrl())
         .isExternal(agencyDTO.getExternal())
+        .hasVideoCalls(isNull(hasVideoCalls) ? new AgencyDTO().getHasVideoCalls() : hasVideoCalls)
         .createDate(LocalDateTime.now(ZoneOffset.UTC))
         .updateDate(LocalDateTime.now(ZoneOffset.UTC));
 
@@ -151,6 +154,7 @@ public AgencyAdminFullResponseDTO updateAgency(Long agencyId, UpdateAgencyDTO up
   }
 
   private Agency mergeAgencies(Agency agency, UpdateAgencyDTO updateAgencyDTO) {
+    var hasVideoCalls = updateAgencyDTO.getHasVideoCalls();
 
     var agencyBuilder = Agency.builder()
         .id(agency.getId())
@@ -163,6 +167,7 @@ private Agency mergeAgencies(Agency agency, UpdateAgencyDTO updateAgencyDTO) {
         .teamAgency(agency.isTeamAgency())
         .url(updateAgencyDTO.getUrl())
         .isExternal(updateAgencyDTO.getExternal())
+        .hasVideoCalls(isNull(hasVideoCalls) ? new UpdateAgencyDTO().getHasVideoCalls() : hasVideoCalls)
         .createDate(agency.getCreateDate())
         .updateDate(LocalDateTime.now(ZoneOffset.UTC))
         .deleteDate(agency.getDeleteDate());

src/main/java/de/caritas/cob/agencyservice/api/admin/service/agency/AgencyAdminFullResponseDTOBuilder.java

@@ -46,6 +46,7 @@ private AgencyAdminResponseDTO createAgency() {
         .teamAgency(this.agency.isTeamAgency())
         .url(this.agency.getUrl())
         .external((this.agency.isExternal()))
+        .hasVideoCalls(agency.getHasVideoCalls())
         .offline(this.agency.isOffline())
         .topics(getTopics())
         .createDate(String.valueOf(this.agency.getCreateDate()))

src/main/java/de/caritas/cob/agencyservice/api/repository/agency/Agency.java

@@ -180,6 +180,9 @@ private Integer getPostCodeInteger() {
   @Field
   private Long tenantId;
 
+  @Column(nullable = false, columnDefinition = "bit default true")
+  private Boolean hasVideoCalls;
+
   @Transient
   public boolean hasAnyDemographicsAttributes() {
     return getAgeTo() != null || getAgeFrom() != null || getGenders() != null;

src/main/resources/db/changelog/agencyservice-dev-master.xml

@@ -17,4 +17,5 @@
 	<include file="db/changelog/changeset/0009_agency_topic/0009_changeSet.xml"/>
 	<include file="db/changelog/changeset/0010_agency_demographics/0010_changeSet.xml"/>
 	<include file="db/changelog/changeset/0011_agency_demographics_gender_column_change/0011_changeSet.xml"/>
+	<include file="db/changelog/changeset/0012_agency_video_calls/0012_changeSet.xml"/>
 </databaseChangeLog>

src/main/resources/db/changelog/agencyservice-local-master.xml

@@ -17,4 +17,5 @@
   <include file="db/changelog/changeset/0009_agency_topic/0009_changeSet.xml"/>
   <include file="db/changelog/changeset/0010_agency_demographics/0010_changeSet.xml"/>
   <include file="db/changelog/changeset/0011_agency_demographics_gender_column_change/0011_changeSet.xml"/>
+  <include file="db/changelog/changeset/0012_agency_video_calls/0012_changeSet.xml"/>
 </databaseChangeLog>

src/main/resources/db/changelog/agencyservice-prod-master.xml

@@ -14,4 +14,5 @@
 	<include file="db/changelog/changeset/0009_agency_topic/0009_changeSet.xml"/>
 	<include file="db/changelog/changeset/0010_agency_demographics/0010_changeSet.xml"/>
 	<include file="db/changelog/changeset/0011_agency_demographics_gender_column_change/0011_changeSet.xml"/>
+	<include file="db/changelog/changeset/0012_agency_video_calls/0012_changeSet.xml"/>
 </databaseChangeLog>

src/main/resources/db/changelog/agencyservice-staging-master.xml

@@ -14,4 +14,5 @@
 	<include file="db/changelog/changeset/0009_agency_topic/0009_changeSet.xml"/>
 	<include file="db/changelog/changeset/0010_agency_demographics/0010_changeSet.xml"/>
 	<include file="db/changelog/changeset/0011_agency_demographics_gender_column_change/0011_changeSet.xml"/>
+	<include file="db/changelog/changeset/0012_agency_video_calls/0012_changeSet.xml"/>
 </databaseChangeLog>

src/main/resources/db/changelog/changeset/0012_agency_video_calls/0012_changeSet.xml

@@ -0,0 +1,9 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="OB-28" id="OB-28-agency_video_calls">
+		<sqlFile path="db/changelog/changeset/0012_agency_video_calls/agencyVideoCalls.sql" stripComments="true" />
+		<rollback>
+			<sqlFile path="db/changelog/changeset/0012_agency_video_calls/agencyVideoCalls-rollback.sql" stripComments="true" />
+		</rollback>
+	</changeSet>
+</databaseChangeLog>

src/main/resources/db/changelog/changeset/0012_agency_video_calls/agencyVideoCalls-rollback.sql

@@ -0,0 +1,2 @@
+alter table agencyservice.agency
+    drop has_video_calls;

src/main/resources/db/changelog/changeset/0012_agency_video_calls/agencyVideoCalls.sql

@@ -0,0 +1,2 @@
+alter table agencyservice.agency
+    add has_video_calls bit default true not null after is_external;