Merge branch 'develop' into release

iris-connect · Mar 14, 2022 · e60676f · e60676f
2 parents 4902abd + e2cbe3c
commit e60676f
Show file tree

Hide file tree

Showing 17 changed files with 299 additions and 46 deletions.
diff --git a/infrastructure/deployment/docker-compose.yml b/infrastructure/deployment/docker-compose.yml
@@ -34,6 +34,8 @@ services:
     depends_on:
       - logger
     restart: unless-stopped
+    labels:
+      - "com.centurylinklabs.watchtower.scope=${IRIS_CLIENT_DOMAIN}"
 
   # IRIS Client backend for frontend
   iris-client:
@@ -63,6 +65,8 @@ services:
       timeout: 3s
       retries: 2
       start_period: 10s
+    labels:
+      - "com.centurylinklabs.watchtower.scope=${IRIS_CLIENT_DOMAIN}"
 
   # IRIS Client Frontend for users
   iris-frontend:
@@ -78,6 +82,8 @@ services:
     depends_on:
       - iris-client
     restart: unless-stopped
+    labels:
+      - "com.centurylinklabs.watchtower.scope=${IRIS_CLIENT_DOMAIN}"
 
   # Endpoint server to communicate with Apps and IRIS Connect central services
   eps:
@@ -98,6 +104,8 @@ services:
       EPS_CLIENT_CERT:
       EPS_CLIENT_CERT_KEY:
     restart: unless-stopped
+    labels:
+      - "com.centurylinklabs.watchtower.scope=${IRIS_CLIENT_DOMAIN}"
 
   # Proxy for inbound connections.
   private-proxy:
@@ -124,6 +132,8 @@ services:
       - logger
       - private-proxy-eps
     restart: unless-stopped
+    labels:
+      - "com.centurylinklabs.watchtower.scope=${IRIS_CLIENT_DOMAIN}"
 
   private-proxy-eps:
     image: inoeg/iris-client-eps:1.5-latest
@@ -143,6 +153,8 @@ services:
     depends_on:
       - logger
     restart: unless-stopped
+    labels:
+      - "com.centurylinklabs.watchtower.scope=${IRIS_CLIENT_DOMAIN}"
 
   # Reverse Proxy
   nginx:
@@ -159,6 +171,8 @@ services:
       - iris-client
       - iris-frontend
     restart: unless-stopped
+    labels:
+      - "com.centurylinklabs.watchtower.scope=${IRIS_CLIENT_DOMAIN}"
 
   # Watchtower for auto-updates
   watchtower:
@@ -172,9 +186,12 @@ services:
       TZ: Europe/Berlin
       WATCHTOWER_SCHEDULE: 0 0 3 * * *
       WATCHTOWER_NO_PULL: "true"
+      WATCHTOWER_SCOPE: "${IRIS_CLIENT_DOMAIN}"
     depends_on:
       - nginx
     restart: unless-stopped
+    labels:
+      - "com.centurylinklabs.watchtower.scope=${IRIS_CLIENT_DOMAIN}"
 
   # Log shipper
   logger:
@@ -196,6 +213,8 @@ services:
       - ${LOG_FOLDER:-./logs}:/srv/logs
       - /var/run/docker.sock:/var/run/docker.sock
     restart: unless-stopped
+    labels:
+      - "com.centurylinklabs.watchtower.scope=${IRIS_CLIENT_DOMAIN}"
 
 volumes:
   psqldata_iris:

diff --git a/infrastructure/dev/docker-compose.yml b/infrastructure/dev/docker-compose.yml
@@ -32,14 +32,16 @@ services:
       timeout: 3s
       retries: 4
       start_period: 30s
+    labels:
+      - "com.centurylinklabs.watchtower.scope=${IRIS_CLIENT_DOMAIN}"
 
   # IRIS Client backend for frontend (autoupdated by watchtower)
   iris-client:
     image: inoeg/iris-client-bff:${CLIENT_VERSION}
     expose:
       - 8092
     labels:
-      - "com.centurylinklabs.watchtower.enable=true"
+      - "com.centurylinklabs.watchtower.scope=${IRIS_CLIENT_DOMAIN}"
     environment:
       SPRING_DATASOURCE_URL: jdbc:postgresql://postgres:5432/${POSTGRES_USER}
       SPRING_DATASOURCE_USERNAME: ${POSTGRES_USER}
@@ -83,7 +85,7 @@ services:
     expose:
       - 28080
     labels:
-      - "com.centurylinklabs.watchtower.enable=true"
+      - "com.centurylinklabs.watchtower.scope=${IRIS_CLIENT_DOMAIN}"
     environment:
       SORMAS_SIDECAR_BASE_URL: /api
       CSV_EXPORT_STANDARD_ATOMIC_ADDRESS: "true"
@@ -104,14 +106,16 @@ services:
     environment:
       - EPS_SETTINGS=settings/roles/hd-1
     command: ["--level", "debug", "server", "run"]
+    labels:
+      - "com.centurylinklabs.watchtower.scope=${IRIS_CLIENT_DOMAIN}"
 
   # Reverse Proxy
   nginx:
     image: inoeg/iris-client-nginx:develop
     ports:
       - ${NGINX_PORT}:443
     labels:
-      - "com.centurylinklabs.watchtower.enable=true"
+      - "com.centurylinklabs.watchtower.scope=${IRIS_CLIENT_DOMAIN}"
     environment:
       IRIS_CLIENT_DOMAIN:
       IRIS_CLIENT_DOMAIN_CERT:
@@ -135,6 +139,8 @@ services:
       - PROXY_SETTINGS=settings/roles/private-proxy-1
       - MOUNT_POINTS=/app/settings,/private-proxy
     command: [ "--level", "trace", "run", "private" ]
+    labels:
+      - "com.centurylinklabs.watchtower.scope=${IRIS_CLIENT_DOMAIN}"
 
   private-proxy-1:
     image: inoeg/eps:${EPS_VERSION}
@@ -146,6 +152,19 @@ services:
     environment:
       - EPS_SETTINGS=settings/roles/private-proxy-eps-1
     command: [ "--level", "trace", "server", "run" ]
+    labels:
+      - "com.centurylinklabs.watchtower.scope=${IRIS_CLIENT_DOMAIN}"
+
+  watchtower:
+    image: containrrr/watchtower
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+    environment:
+      TZ: Europe/Berlin
+      WATCHTOWER_POLL_INTERVAL: 60
+      WATCHTOWER_SCOPE: "${IRIS_CLIENT_DOMAIN}"
+    labels:
+      - "com.centurylinklabs.watchtower.scope=${IRIS_CLIENT_DOMAIN}"
 
 volumes:
   psqldata_iris:
diff --git a/iris-client-bff/src/main/java/iris/client_bff/vaccination_info/VaccinationInfo.java b/iris-client-bff/src/main/java/iris/client_bff/vaccination_info/VaccinationInfo.java
@@ -1,5 +1,7 @@
 package iris.client_bff.vaccination_info;
 
+import static iris.client_bff.vaccination_info.VaccinationStatus.*;
+
 import iris.client_bff.core.Aggregate;
 import iris.client_bff.core.Id;
 import iris.client_bff.core.Sex;
@@ -18,16 +20,9 @@
 import java.time.LocalDate;
 import java.util.Set;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import javax.persistence.*;
 
 import org.hibernate.search.engine.backend.types.Sortable;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField;
@@ -44,7 +39,6 @@
 @Data
 @Setter(AccessLevel.PACKAGE)
 @EqualsAndHashCode(callSuper = true, of = {})
-@AllArgsConstructor(staticName = "of")
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class VaccinationInfo extends Aggregate<VaccinationInfo, VaccinationInfoIdentifier> {
 
@@ -61,6 +55,34 @@ public class VaccinationInfo extends Aggregate<VaccinationInfo, VaccinationInfoI
 	@JoinColumn(name = "vaccination_info_id", nullable = false)
 	private Set<Employee> employees;
 
+	@IndexedEmbedded
+	private final VaccinationStatusCount vaccinationStatusCount = new VaccinationStatusCount();
+
+	public static VaccinationInfo of(String externalId, Facility facility, Set<Employee> createEmployees) {
+		return new VaccinationInfo(externalId, facility, createEmployees);
+	}
+
+	VaccinationInfo(String externalId, Facility facility, Set<Employee> employees) {
+
+		this.externalId = externalId;
+		this.facility = facility;
+		this.employees = employees;
+
+		determineStatusCounts();
+	}
+
+	@PrePersist
+	@PostLoad
+	void determineStatusCounts() {
+		vaccinationStatusCount.determineCounts(getEmployees());
+	}
+
+	void setEmployees(Set<Employee> employees) {
+
+		this.employees = employees;
+		determineStatusCounts();
+	}
+
 	@Embeddable
 	@EqualsAndHashCode
 	@RequiredArgsConstructor(staticName = "of")
@@ -89,6 +111,43 @@ public String toString() {
 		}
 	}
 
+	@Embeddable
+	@Data
+	@Setter(AccessLevel.PACKAGE)
+	@AllArgsConstructor(staticName = "of")
+	@NoArgsConstructor(access = AccessLevel.PRIVATE)
+	public static class VaccinationStatusCount {
+
+		@Column(name = "status_vaccinated_count")
+		@GenericField(sortable = Sortable.YES)
+		private long vaccinated;
+
+		@Column(name = "status_not_vaccinated_count")
+		@GenericField(sortable = Sortable.YES)
+		private long notVaccinated;
+
+		@Column(name = "status_suspicious_proof_count")
+		@GenericField(sortable = Sortable.YES)
+		private long suspiciousProof;
+
+		@Column(name = "status_unknown_count")
+		@GenericField(sortable = Sortable.YES)
+		private long unknown;
+
+		void determineCounts(Set<Employee> employees) {
+
+			var statusCountMap = employees.stream()
+					.collect(Collectors.groupingBy(
+							VaccinationInfo.Employee::getVaccinationStatus,
+							Collectors.counting()));
+
+			vaccinated = statusCountMap.getOrDefault(VACCINATED, 0l);
+			notVaccinated = statusCountMap.getOrDefault(NOT_VACCINATED, 0l);
+			suspiciousProof = statusCountMap.getOrDefault(SUSPICIOUS_PROOF, 0l);
+			unknown = statusCountMap.getOrDefault(UNKNOWN, 0l);
+		}
+	}
+
 	@Embeddable
 	@Data
 	@Setter(AccessLevel.PACKAGE)
@@ -155,4 +214,5 @@ public static class Employee {
 		@GenericField(sortable = Sortable.YES)
 		private VaccinationStatus vaccinationStatus;
 	}
+
 }
diff --git a/...ent-bff/src/main/java/iris/client_bff/vaccination_info/web/VaccinationInfoController.java b/...ent-bff/src/main/java/iris/client_bff/vaccination_info/web/VaccinationInfoController.java
@@ -19,7 +19,9 @@
 import java.util.stream.Collectors;
 
 import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
 import org.springframework.http.HttpStatus;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -42,13 +44,31 @@ public Page<VaccinationReportDto> getVaccinationInfos(
 			@RequestParam Optional<@NoSignOfAttack String> search,
 			Pageable pageable) {
 
+		var newPageable = adaptPageable(pageable);
+
 		var vaccInfos = search
 				.map(it -> service.search(it, pageable))
-				.orElseGet(() -> service.getAll(pageable));
+				.orElseGet(() -> service.getAll(newPageable));
 
 		return vaccInfos.map(this::map);
 	}
 
+	private PageRequest adaptPageable(Pageable pageable) {
+
+		var sort = pageable.getSort();
+		var orders = sort.map(it -> {
+			if (it.getProperty().equals("reportedAt")) {
+				return it.withProperty("metadata.created");
+			}
+
+			return it;
+		}).toList();
+
+		sort = Sort.by(orders);
+
+		return PageRequest.of(pageable.getPageNumber(), pageable.getPageSize(), sort);
+	}
+
 	@GetMapping("/{id}")
 	public VaccinationReportDetailsDto getDetails(@PathVariable VaccinationInfoIdentifier id) {
 

diff --git a/iris-client-bff/src/main/resources/db/migration/V1011__add_vaccination_info.sql b/iris-client-bff/src/main/resources/db/migration/V1011__add_vaccination_info.sql
@@ -10,6 +10,10 @@ CREATE TABLE vaccination_infos (
 	facility_contact_last_name varchar(100) NULL,
 	facility_contact_email varchar(100) NULL,
 	facility_contact_phone varchar(100) NULL, 
+	status_vaccinated_count bigint NOT NULL,
+	status_not_vaccinated_count bigint NOT NULL,
+	status_suspicious_proof_count bigint NOT NULL,
+	status_unknown_count bigint NOT NULL,
 	created timestamp NOT NULL,
 	last_modified timestamp NOT NULL,
 	created_by uuid NULL,

diff --git a/iris-client-bff/src/main/resources/db/migration_mssql/V1011__add_vaccination_info.sql b/iris-client-bff/src/main/resources/db/migration_mssql/V1011__add_vaccination_info.sql
@@ -10,6 +10,10 @@ CREATE TABLE vaccination_infos (
 	facility_contact_last_name varchar(100) NULL,
 	facility_contact_email varchar(100) NULL,
 	facility_contact_phone varchar(100) NULL, 
+	status_vaccinated_count bigint NOT NULL,
+	status_not_vaccinated_count bigint NOT NULL,
+	status_suspicious_proof_count bigint NOT NULL,
+	status_unknown_count bigint NOT NULL,
 	created datetime2 NOT NULL,
 	last_modified datetime2 NOT NULL,
 	created_by binary(255) NULL,

diff --git a/iris-client-bff/src/main/resources/db/migration_mysql/V1011__add_vaccination_info.sql b/iris-client-bff/src/main/resources/db/migration_mysql/V1011__add_vaccination_info.sql
@@ -10,6 +10,10 @@ CREATE TABLE vaccination_infos (
 	facility_contact_last_name varchar(100) NULL,
 	facility_contact_email varchar(100) NULL,
 	facility_contact_phone varchar(100) NULL, 
+	status_vaccinated_count bigint NOT NULL,
+	status_not_vaccinated_count bigint NOT NULL,
+	status_suspicious_proof_count bigint NOT NULL,
+	status_unknown_count bigint NOT NULL,
 	created datetime NOT NULL,
 	last_modified datetime NOT NULL,
 	created_by binary(16) NULL,