Feature/core 614

backend/src/main/java/quarano/occasion/Occasion.java

@@ -6,6 +6,7 @@
 import lombok.NoArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
+import quarano.core.Address;
 import quarano.core.QuaranoAggregate;
 import quarano.department.TrackedCase.TrackedCaseIdentifier;
 import quarano.occasion.Occasion.OccasionIdentifier;
@@ -36,16 +37,22 @@ public class Occasion extends QuaranoAggregate<Occasion, OccasionIdentifier> {
 	private @Setter @Column(name = "start_date") LocalDateTime start;
 	private @Setter @Column(name = "end_date") LocalDateTime end;
 	private @Setter String title;
+	private @Setter String additionalInformation;
+	private @Setter String contactPerson;
 	private OccasionCode occasionCode;
 	private TrackedCaseIdentifier trackedCaseId;
+	private @Setter Address address;
 
-	Occasion(String title, LocalDateTime start, LocalDateTime end, OccasionCode eventCode,
+	Occasion(String title, LocalDateTime start, LocalDateTime end, Address address, String additionalInformation, String contactPerson, OccasionCode eventCode,
 			TrackedCaseIdentifier trackedCaseId) {
 
 		this.id = OccasionIdentifier.of(UUID.randomUUID());
 		this.start = start;
 		this.end = end;
 		this.title = title;
+		this.address = address;
+		this.additionalInformation = additionalInformation;
+		this.contactPerson = contactPerson;
 		this.visitorGroups = new ArrayList<>();
 		this.occasionCode = eventCode;
 		this.trackedCaseId = trackedCaseId;

backend/src/main/java/quarano/occasion/OccasionDataInitializer.java

@@ -2,6 +2,8 @@
 
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
+import quarano.core.Address;
+import quarano.core.ZipCode;
 import quarano.core.DataInitializer;
 import quarano.department.TrackedCaseDataInitializer;
 
@@ -28,8 +30,7 @@ public class OccasionDataInitializer implements DataInitializer {
 	 */
 	@Override
 	public void initialize() {
-
 		occasions.save(new Occasion("Sample event", LocalDate.now().atStartOfDay(),
-				LocalDate.now().plusDays(1).atStartOfDay(), OCCASION_CODE_1, TrackedCaseDataInitializer.TRACKED_CASE_MARKUS));
+				LocalDate.now().plusDays(1).atStartOfDay(), new Address("Musterstraße", Address.HouseNumber.of("2"), "Musterstadt", ZipCode.of("12345")),"","", OCCASION_CODE_1, TrackedCaseDataInitializer.TRACKED_CASE_MARKUS));
 	}
 }

backend/src/main/java/quarano/occasion/OccasionManagement.java

@@ -1,6 +1,8 @@
 package quarano.occasion;
 
 import lombok.RequiredArgsConstructor;
+import quarano.core.Address;
+import quarano.core.ZipCode;
 import quarano.department.TrackedCase.TrackedCaseIdentifier;
 import quarano.department.TrackedCaseRepository;
 
@@ -32,16 +34,42 @@ public class OccasionManagement {
 	 * @param title must not be {@literal null} or empty.
 	 * @param start must not be {@literal null}.
 	 * @param end must not be {@literal null}.
+	 * @param street
+	 * @param s
+	 * @param postalCode
+	 * @param city
+	 * @param contactPerson
+	 * @param additionalInformation
 	 * @param trackedCaseId the {@link TrackedCaseIdentifier} for the case which the {@link Occasion} to be created shall
 	 *          be associated with. Must not be {@literal null}.
 	 * @return will never be {@literal null}.
 	 */
 	public Optional<Occasion> createOccasion(String title, LocalDateTime start, LocalDateTime end,
-			TrackedCaseIdentifier trackedCaseId) {
-
+											 String street, String houseNumber, String zipCode, String city, String additionalInformation, String contactPerson, TrackedCaseIdentifier trackedCaseId) {
+		Address address = new Address(street, Address.HouseNumber.of(houseNumber), city, ZipCode.of(zipCode));
 		return !trackedCaseRepository.existsById(trackedCaseId)
 				? Optional.empty()
-				: Optional.of(occasions.save(new Occasion(title, start, end, findValidOccasionCode(), trackedCaseId)));
+				: Optional.of(occasions.save(new Occasion(title, start, end, address,additionalInformation, contactPerson, findValidOccasionCode(), trackedCaseId)));
+	}
+
+	/**
+	 * Updates the {@link Occasion} that has the given {@link OccasionCode} assigned.
+	 *
+	 * @param trackedCaseId
+	 * @param occasion must not be {@literal null}.
+	 * @param id
+	 * @return will never be {@literal null}.
+	 */
+	public Occasion updateOccasionBy(String title, LocalDateTime start, LocalDateTime end,
+									 String street, String houseNumber, String zipCode, String city, String additionalInformation, String contactPerson, Occasion existing) {
+		Address address = new Address(street, Address.HouseNumber.of(houseNumber), city, ZipCode.of(zipCode));
+		existing.setTitle(title);
+		existing.setStart(start);
+		existing.setEnd(end);
+		existing.setAddress(address);
+		existing.setAdditionalInformation(additionalInformation);
+		existing.setContactPerson(contactPerson);
+		return occasions.save(existing);
 	}
 
 	/**
@@ -86,4 +114,8 @@ private OccasionCode findValidOccasionCode() {
 				? occasionCode
 				: findValidOccasionCode();
 	}
+
+    public void deleteOccasion(Occasion occasion) {
+		occasions.delete(occasion);
+    }
 }

backend/src/main/java/quarano/occasion/web/OccasionController.java

@@ -18,11 +18,14 @@
 import org.springframework.hateoas.mediatype.hal.HalModelBuilder;
 import org.springframework.hateoas.server.mvc.MvcLink;
 import org.springframework.http.HttpEntity;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.Errors;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -68,6 +71,44 @@ HttpEntity<?> getOccasion(@PathVariable OccasionCode occasionCode) {
 				.orElseGet(() -> ResponseEntity.notFound().build());
 	}
 
+	/**
+	 * Update the occasion registered for the given {@link OccasionCode}.
+	 *
+	 * @param occasionCode must not be {@literal null}.
+	 * @param payload
+	 * @param errors
+	 * @return will never be {@literal null}.
+	 */
+	@PutMapping("/hd/occasions/{occasionCode:" + OccasionCode.REGEX + "}")
+	HttpEntity<?> getOccasion(@PathVariable OccasionCode occasionCode, @RequestBody OccasionsDto payload, Errors errors) {
+		var existing = occasions.findOccasionBy(occasionCode).orElse(null);
+		return MappedPayloads.of(payload, errors)
+				.notFoundIf(existing == null)
+				.map(it -> occasions.updateOccasionBy(it.title, it.start, it.end, it.street, it.houseNumber, it.zipCode, it.city, it.additionalInformation, it.contactPerson, existing))
+				.map(representations::toSummary)
+				.concludeIfValid(ResponseEntity::ok);
+	}
+
+
+	/**
+	 * Delete the occasion registered for the given {@link OccasionCode}.
+	 *
+	 * @param occasionCode must not be {@literal null}.
+	 * @return will never be {@literal null}.
+	 */
+
+	@DeleteMapping("/hd/occasions/{occasionCode:" + OccasionCode.REGEX + "}")
+	HttpEntity<?> deleteOccasion(@PathVariable OccasionCode occasionCode) {
+
+		return occasions.findOccasionBy(occasionCode)
+				.map(it -> {
+					occasions.deleteOccasion(it);
+					return ResponseEntity.ok()
+							.contentType(MediaType.APPLICATION_JSON)
+							.build();
+				}).orElseGet(() -> ResponseEntity.badRequest().build());
+	}
+
 	/**
 	 * Creates a new occasion associated with the {@link TrackedCase} identified by the given
 	 * {@link TrackedCaseIdentifier}.
@@ -82,7 +123,7 @@ HttpEntity<?> postOccasions(@PathVariable("id") TrackedCaseIdentifier trackedCas
 			@RequestBody OccasionsDto payload, Errors errors) {
 
 		return MappedPayloads.of(payload, errors)
-				.flatMap(it -> occasions.createOccasion(it.title, it.start, it.end, trackedCaseId))
+				.flatMap(it -> occasions.createOccasion(it.title, it.start, it.end, it.street, it.street, it.zipCode, it.city, it.additionalInformation, it.contactPerson,  trackedCaseId))
 				.map(representations::toSummary)
 				.concludeIfValid(ResponseEntity::ok);
 	}

backend/src/main/java/quarano/occasion/web/OccasionRepresentions.java

@@ -70,6 +70,18 @@ public static class OccasionsDto {
 		 * The end date and time of the occasion.
 		 */
 		LocalDateTime end;
+
+		@Pattern(regexp = Strings.STREET) String street;
+
+		@Pattern(regexp = Strings.HOUSE_NUMBER) String houseNumber;
+
+		@Pattern(regexp = ZipCode.PATTERN) String zipCode;
+
+		@Pattern(regexp = Strings.CITY) String city;
+
+		@Textual String contactPerson;
+
+		@Textual String additionalInformation;
 	}
 
 	interface OccasionSummary {
@@ -80,6 +92,12 @@ interface OccasionSummary {
 
 		LocalDateTime getEnd();
 
+		OccasionAddress getAddress();
+
+		String getAdditionalInformation();
+
+		String getContactPerson();
+
 		/**
 		 * An 8-digit occasion code to be handed to location owners or third-party software to report visitor groups. Note
 		 * the absence of characters that might be ambiguous when transmitted verbally or in hand writing (I, J, 1, O, 0).
@@ -90,6 +108,18 @@ interface OccasionSummary {
 
 		List<VisitorGroupSummary> getVisitorGroups();
 
+		interface OccasionAddress{
+
+			String getStreet();
+
+			String getHouseNumber();
+
+			String getZipCode();
+
+			String getCity();
+
+		}
+
 		interface VisitorGroupSummary {
 
 			List<VisitorSummary> getVisitors();

backend/src/main/resources/db/migration/V1025__Extend_Occasions.sql

@@ -0,0 +1,7 @@
+ALTER TABLE occasions ADD city varchar(255) NULL;
+ALTER TABLE occasions ADD house_number varchar(255) NULL;
+ALTER TABLE occasions ADD street varchar(255) NULL;
+ALTER TABLE occasions ADD zipcode varchar(255) NULL;
+ALTER TABLE occasions ADD contact_person varchar(255) NULL;
+ALTER TABLE occasions ADD additional_information varchar(255) NULL;
+

backend/src/test/java/quarano/occasion/GDPRDeleteJobIntegrationTests.java

@@ -92,7 +92,7 @@ void testDeleteVisitors() {
 
 	private void createOccasion(String title, String locationName, String... visitorNames) {
 
-		var event = occasions.createOccasion(title, today.atStartOfDay(), today.plusDays(1).atStartOfDay(),
+/* TODO 614		var event = occasions.createOccasion(title, today.atStartOfDay(), today.plusDays(1).atStartOfDay(),
 				TrackedCaseDataInitializer.TRACKED_CASE_MARKUS).orElseThrow();
 
 		var visitors = Arrays.stream(visitorNames)
@@ -103,6 +103,6 @@ private void createOccasion(String title, String locationName, String... visitor
 				.setLocationName(locationName)
 				.setVisitors(visitors);
 
-		occasions.registerVisitorGroupForEvent(event.getOccasionCode(), visitorGroup);
+		occasions.registerVisitorGroupForEvent(event.getOccasionCode(), visitorGroup);*/
 	}
 }

backend/src/test/java/quarano/occasion/OccasionManagementIntegrationTests.java

@@ -27,7 +27,7 @@ class OccasionManagementIntegrationTests {
 	void testCreateEvent() {
 
 		var event = occasions.createOccasion("TestEvent", today.atStartOfDay(), today.plusDays(1).atStartOfDay(),
-				TrackedCaseDataInitializer.TRACKED_CASE_MARKUS);
+				"Musterstraße", "2", "12345", "Musterstadt", "Event Location ftw", "Oma Gerda", TrackedCaseDataInitializer.TRACKED_CASE_MARKUS);
 
 		assertThat(event).map(Occasion::getOccasionCode).isPresent();
 	}
@@ -36,7 +36,7 @@ void testCreateEvent() {
 	void testCreateEventAndAddGroup() {
 
 		var event = occasions.createOccasion("TestEvent 2", today.atStartOfDay(), today.plusDays(1).atStartOfDay(),
-				TrackedCaseDataInitializer.TRACKED_CASE_MARKUS).orElseThrow();
+                "Musterstraße", "2", "12345", "Musterstadt", "Event Location ftw", "Oma Gerda", TrackedCaseDataInitializer.TRACKED_CASE_MARKUS).orElseThrow();
 
 		var visitorGroup = new VisitorGroup(today.atStartOfDay(), event.getOccasionCode())
 				.setComment("Comment")

backend/src/test/java/quarano/occasion/web/OccasionControllerWebIntegrationTests.java

@@ -11,6 +11,7 @@
 import quarano.QuaranoWebIntegrationTest;
 import quarano.WithQuaranoUser;
 import quarano.department.TrackedCaseDataInitializer;
+import quarano.occasion.OccasionCode;
 import quarano.occasion.web.OccasionRepresentions.OccasionsDto;
 
 import java.time.LocalDateTime;
@@ -40,7 +41,7 @@ class OccasionControllerWebIntegrationTests extends AbstractDocumentation {
 	void createOccasionTest() throws Exception {
 
 		var now = LocalDateTime.now();
-		var payload = new OccasionsDto("Omas 80. Geburtstag", now.minusDays(7), now.minusDays(6));
+		var payload = new OccasionsDto("Omas 80. Geburtstag", now.minusDays(7), now.minusDays(6),"Musterstraße","2","12435", "Musterstadt", "Max Mustermann", "War eine nette Feier");
 
 		var respones = mvc.perform(post("/hd/cases/{id}/occasions", TrackedCaseDataInitializer.TRACKED_CASE_MARKUS)
 				.content(objectMapper.writeValueAsString(payload))
@@ -54,4 +55,85 @@ void createOccasionTest() throws Exception {
 
 		assertThat(parseDoc.read("$.occasionCode", String.class)).isNotBlank();
 	}
+
+	@Test // CORE-613
+	@WithQuaranoUser("admin")
+	void deleteOccasionTest() throws Exception {
+
+		var respones = mvc.perform(get("/hd/occasions")
+				.contentType(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andDo(flow.document("get-occasions",
+						responseFields().responseBodyAsType(OccasionRepresentions.OccasionSummary.class)))
+				.andReturn().getResponse().getContentAsString();
+
+		var parseDoc = JsonPath.parse(respones);
+		String occasionCode = parseDoc.read("$._embedded.occasions[0].occasionCode", String.class);
+		assertThat(occasionCode).isNotBlank();
+
+		mvc.perform(delete("/hd/occasions/{occasion-code}", occasionCode)
+				.contentType(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andDo(flow.document("delete-occasion",
+						responseFields().responseBodyAsType(OccasionRepresentions.OccasionSummary.class)));
+
+	}
+
+	@Test // CORE-613
+	@WithQuaranoUser("admin")
+	void updateOccasionTest() throws Exception {
+
+		var respones = mvc.perform(get("/hd/occasions")
+				.contentType(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andDo(flow.document("get-occasions",
+						responseFields().responseBodyAsType(OccasionRepresentions.OccasionSummary.class)))
+				.andReturn().getResponse().getContentAsString();
+
+		var parseDoc = JsonPath.parse(respones);
+		String occasionCode = parseDoc.read("$._embedded.occasions[0].occasionCode", String.class);
+		assertThat(occasionCode).isNotBlank();
+
+		var now = LocalDateTime.now();
+		var dtoUpdate = new OccasionsDto("Omas 79. Geburtstag", now.minusDays(7), now.minusDays(6), "Musterstraße", "2", "54321", "Musterstadt", "Max Mustermann", "War eine nette Feier");
+
+		mvc.perform(put("/hd/occasions/{occasion-code}", occasionCode)
+				.content(objectMapper.writeValueAsString(dtoUpdate))
+				.contentType(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andDo(flow.document("update-occasions",
+						responseFields().responseBodyAsType(OccasionRepresentions.OccasionSummary.class)));
+
+		var responseUpdated = mvc.perform(get("/hd/occasions/{occasion-code}", occasionCode)
+				.contentType(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andDo(flow.document("get-occasions",
+						responseFields().responseBodyAsType(OccasionRepresentions.OccasionSummary.class)))
+				.andReturn().getResponse().getContentAsString();
+
+		var parseDocUpdated = JsonPath.parse(responseUpdated);
+		String occasionCodeUpdated = parseDocUpdated.read("$.occasionCode", String.class);
+		String zipCodeUpdated = parseDocUpdated.read("$.address.zipCode", String.class);
+		String titleUpdated = parseDocUpdated.read("$.title", String.class);
+
+		assertThat(occasionCodeUpdated).isEqualTo(occasionCode);
+		assertThat(zipCodeUpdated).isEqualTo("54321");
+		assertThat(titleUpdated).isEqualTo("Omas 79. Geburtstag");
+	}
+
+	@Test // CORE-613
+	@WithQuaranoUser("admin")
+	void updateOccasionWithInvalidOccasionCodeTest() throws Exception {
+		OccasionCode occasionCode = OccasionCode.of("INVALID");
+
+		var now = LocalDateTime.now();
+		var payload = new OccasionsDto("Omas 80. Geburtstag", now.minusDays(7), now.minusDays(6), "Musterstraße", "2", "12435", "Musterstadt", "Max Mustermann", "War eine nette Feier");
+
+		mvc.perform(put("/hd/occasions/{occasion-code}", occasionCode)
+				.content(objectMapper.writeValueAsString(payload))
+				.contentType(MediaType.APPLICATION_JSON))
+				.andExpect(status().isNotFound())
+				.andDo(flow.document("update-occasions",
+						responseFields().responseBodyAsType(OccasionRepresentions.OccasionSummary.class)));
+	}
 }