diff --git a/src/main/java/app/coronawarn/quicktest/model/keycloak/KeycloakGroupDetails.java b/src/main/java/app/coronawarn/quicktest/model/keycloak/KeycloakGroupDetails.java index 15a11c67..3fa6253b 100644 --- a/src/main/java/app/coronawarn/quicktest/model/keycloak/KeycloakGroupDetails.java +++ b/src/main/java/app/coronawarn/quicktest/model/keycloak/KeycloakGroupDetails.java @@ -21,6 +21,7 @@ package app.coronawarn.quicktest.model.keycloak; import io.swagger.v3.oas.annotations.media.Schema; +import java.util.List; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.Size; import lombok.Data; @@ -50,8 +51,8 @@ public class KeycloakGroupDetails { private String email; - @Size(max = 50) - private String openingHours; + @Size(max = 7) + private List<@Size(max = 64) String> openingHours; private Boolean appointmentRequired; diff --git a/src/main/java/app/coronawarn/quicktest/service/KeycloakService.java b/src/main/java/app/coronawarn/quicktest/service/KeycloakService.java index 97ee8267..9a8e8e32 100644 --- a/src/main/java/app/coronawarn/quicktest/service/KeycloakService.java +++ b/src/main/java/app/coronawarn/quicktest/service/KeycloakService.java @@ -29,6 +29,7 @@ import app.coronawarn.quicktest.model.keycloak.KeycloakUserResponse; import app.coronawarn.quicktest.model.map.MapEntrySingleResponse; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -249,7 +250,7 @@ public KeycloakGroupDetails getSubGroupDetails(String groupId) { mapEntry.getAppointment())); if (mapEntry.getOpeningHours() != null) { groupDetails.setOpeningHours( - mapEntry.getOpeningHours().length > 0 ? mapEntry.getOpeningHours()[0] : null); + mapEntry.getOpeningHours().length > 0 ? Arrays.asList(mapEntry.getOpeningHours()) : null); } } else { groupDetails.setSearchPortalConsent(false); diff --git a/src/main/java/app/coronawarn/quicktest/service/MapEntryService.java b/src/main/java/app/coronawarn/quicktest/service/MapEntryService.java index 1831d9d0..87277bea 100644 --- a/src/main/java/app/coronawarn/quicktest/service/MapEntryService.java +++ b/src/main/java/app/coronawarn/quicktest/service/MapEntryService.java @@ -13,6 +13,7 @@ import javax.transaction.Transactional; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.CollectionUtils; import org.keycloak.admin.client.Keycloak; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Component; @@ -124,8 +125,9 @@ private MapEntryUploadData buildUploadData(KeycloakGroupDetails details) { mapEntryUploadData.setEmail(details.getEmail()); mapEntryUploadData.setAppointment(convertAppointmentToString(details.getAppointmentRequired())); mapEntryUploadData.setWebsite(details.getWebsite()); - String[] openingHours = {details.getOpeningHours()}; - mapEntryUploadData.setOpeningHours(openingHours); + if (CollectionUtils.isNotEmpty(details.getOpeningHours())) { + mapEntryUploadData.setOpeningHours(details.getOpeningHours().toArray(String[]::new)); + } return mapEntryUploadData; }