Merge pull request #12903 from SORMAS-Foundation/feature-12697_additi…

…onal_restrictions_added Feature 12697 additional restrictions added
SORMAS-Foundation · Jan 23, 2024 · 7c4fdab · 7c4fdab
2 parents adc9322 + abe0dbd
commit 7c4fdab
Show file tree

Hide file tree

Showing 83 changed files with 1,858 additions and 161 deletions.
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/utils/jurisdiction/JurisdictionValidator.java b/sormas-api/src/main/java/de/symeda/sormas/api/utils/jurisdiction/JurisdictionValidator.java
@@ -23,21 +23,23 @@
 public abstract class JurisdictionValidator<T> {
 
 	protected List<? extends JurisdictionValidator<T>> associatedJurisdictionValidators;
+	private boolean userHasRestrictedAccess;
 
-	public JurisdictionValidator(List<? extends JurisdictionValidator<T>> associatedJurisdictionValidators) {
+	public JurisdictionValidator(List<? extends JurisdictionValidator<T>> associatedJurisdictionValidators, boolean userHasRestrictedAccess) {
 		this.associatedJurisdictionValidators = associatedJurisdictionValidators;
+		this.userHasRestrictedAccess = userHasRestrictedAccess;
 	}
 
 	// disease restriction overrules entity ownership
 	public T inJurisdictionOrOwned() {
-		T rootInJurisdictionOrOwned = isRootInJurisdictionOrOwned();
+		T rootInJurisdictionOrOwned = isRootAccessible();
 		T rootHasLimitedDisease = hasUserLimitedDisease();
 		if (associatedJurisdictionValidators != null && !associatedJurisdictionValidators.isEmpty()) {
 			final List<T> jurisdictionTypes = new ArrayList<>();
 			jurisdictionTypes.add(and(rootInJurisdictionOrOwned, rootHasLimitedDisease));
 			for (JurisdictionValidator<T> jurisdictionValidator : associatedJurisdictionValidators) {
 				if (jurisdictionValidator != null) {
-					T associatedInJurisdictionOrOwned = jurisdictionValidator.isRootInJurisdictionOrOwned();
+					T associatedInJurisdictionOrOwned = jurisdictionValidator.isRootAccessible();
 					T associatedHasLimitedDisease = jurisdictionValidator.hasUserLimitedDisease();
 					jurisdictionTypes.add(and(associatedInJurisdictionOrOwned, associatedHasLimitedDisease));
 				}
@@ -68,12 +70,21 @@ public T inJurisdiction() {
 		}
 	}
 
+	public T isRootAccessible() {
+		if (userHasRestrictedAccess) {
+			return isRootInJurisdictionForRestrictedAccess();
+		}
+		return isRootInJurisdictionOrOwned();
+	}
+
 	public abstract T isRootInJurisdiction();
 
 	public abstract T isRootInJurisdictionOrOwned();
 
 	public abstract T hasUserLimitedDisease();
 
+	public abstract T isRootInJurisdictionForRestrictedAccess();
+
 	protected T isInJurisdictionByJurisdictionLevel(JurisdictionLevel jurisdictionLevel) {
 
 		switch (jurisdictionLevel) {

diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/backend/caze/CaseDao.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/backend/caze/CaseDao.java
@@ -701,6 +701,17 @@ public void deleteCaseAndAllDependingEntities(String caseUuid) throws SQLExcepti
 		deleteCascade(caze);
 	}
 
+	public List<Case> getByPerson(Person person) {
+		try {
+			QueryBuilder qb = queryBuilder();
+			qb.where().eq(Case.PERSON, person);
+			return qb.query();
+		} catch (SQLException e) {
+			Log.e(getTableName(), "Could not perform queryByCriteria on Contact");
+			throw new RuntimeException(e);
+		}
+	}
+
 	public List<Case> getSimilarCases(CaseSimilarityCriteria criteria) {
 		try {
 			QueryBuilder<Case, Long> queryBuilder = queryBuilder();

diff --git a/...app/src/main/java/de/symeda/sormas/app/backend/caze/CaseJurisdictionBooleanValidator.java b/...app/src/main/java/de/symeda/sormas/app/backend/caze/CaseJurisdictionBooleanValidator.java
@@ -43,10 +43,19 @@ public Boolean isRootInJurisdiction() {
         return isInJurisdictionByJurisdictionLevel(userJurisdiction.getJurisdictionLevel());
     }
 
-    @Override
-    public Boolean isRootInJurisdictionOrOwned() {
-        return userJurisdiction.getUuid().equals(caseJurisdiction.getReportingUserUuid()) || inJurisdiction();
-    }
+	@Override
+	public Boolean isRootInJurisdictionOrOwned() {
+		return getReportedByCurrentUser() || inJurisdiction();
+	}
+
+	private boolean getReportedByCurrentUser() {
+		return userJurisdiction.getUuid().equals(caseJurisdiction.getReportingUserUuid());
+	}
+
+	@Override
+	public Boolean isRootInJurisdictionForRestrictedAccess() {
+		return getReportedByCurrentUser() || userJurisdiction.getUuid().equals(caseJurisdiction.getSurveillanceOfficerUuid());
+	}
 
     @Override
     protected Disease getDisease() {

diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/backend/caze/CaseJurisdictionDto.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/backend/caze/CaseJurisdictionDto.java
@@ -34,6 +34,7 @@ public class CaseJurisdictionDto implements Serializable {
 	private String healthFacilityUuid;
 	private String pointOfEntryUuid;
 	private List<String> sampleLabUuids;
+	private String surveillanceOfficerUuid;
 
 	public CaseJurisdictionDto() {
 	}
@@ -118,4 +119,13 @@ public List<String> getSampleLabUuids() {
 	public void setSampleLabUuids(List<String> sampleLabUuids) {
 		this.sampleLabUuids = sampleLabUuids;
 	}
+
+	public String getSurveillanceOfficerUuid() {
+		return surveillanceOfficerUuid;
+	}
+
+	public CaseJurisdictionDto setSurveillanceOfficerUuid(String surveillanceOfficerUuid) {
+		this.surveillanceOfficerUuid = surveillanceOfficerUuid;
+		return this;
+	}
 }
diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/backend/common/DatabaseHelper.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/backend/common/DatabaseHelper.java
@@ -190,7 +190,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
 	public static final String DATABASE_NAME = "sormas.db";
 	// any time you make changes to your database objects, you may have to increase the database version
 
-	public static final int DATABASE_VERSION = 358;
+	public static final int DATABASE_VERSION = 359;
 
 	private static DatabaseHelper instance = null;
 
@@ -3174,6 +3174,11 @@ public void onUpgrade(SQLiteDatabase db, ConnectionSource connectionSource, int
 				currentVersion = 357;
 				getDao(CustomizableEnumValue.class).executeRaw("ALTER TABLE customizableEnumValue ADD COLUMN active boolean default true;");
 
+			case 358:
+				currentVersion = 358;
+				getDao(UserRole.class)
+					.executeRaw("ALTER TABLE userroles ADD COLUMN restrictAccessToAssignedEntities boolean NOT NULL DEFAULT false;");
+
 				// ATTENTION: break should only be done after last version
 				break;
 

diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/backend/contact/ContactDao.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/backend/contact/ContactDao.java
@@ -196,6 +196,17 @@ public List<Contact> queryByCriteria(ContactCriteria criteria, long offset, long
 		}
 	}
 
+	public List<Contact> getByPerson(Person person) {
+		try {
+			QueryBuilder qb = queryBuilder();
+			qb.where().eq(Contact.PERSON, person);
+			return qb.query();
+		} catch (SQLException e) {
+			Log.e(getTableName(), "Could not perform queryByCriteria on Contact");
+			throw new RuntimeException(e);
+		}
+	}
+
 	private QueryBuilder<Contact, Long> buildQueryBuilder(ContactCriteria contactCriteria) throws SQLException {
 		QueryBuilder<Contact, Long> queryBuilder = queryBuilder();
 

diff --git a/...c/main/java/de/symeda/sormas/app/backend/contact/ContactJurisdictionBooleanValidator.java b/...c/main/java/de/symeda/sormas/app/backend/contact/ContactJurisdictionBooleanValidator.java
@@ -46,11 +46,20 @@ public Boolean isRootInJurisdiction() {
         return isInJurisdictionByJurisdictionLevel(userJurisdiction.getJurisdictionLevel());
     }
 
-    @Override
-    public Boolean isRootInJurisdictionOrOwned() {
-        return userJurisdiction.getUuid().equals(contactJurisdictionDto.getReportingUserUuid()) || inJurisdiction();
+	@Override
+	public Boolean isRootInJurisdictionOrOwned() {
+		return isReportedByCurrentUser() || inJurisdiction();
+	}
+
+	private boolean isReportedByCurrentUser(){
+        return userJurisdiction.getUuid().equals(contactJurisdictionDto.getReportingUserUuid());
     }
 
+	@Override
+	public Boolean isRootInJurisdictionForRestrictedAccess() {
+		return isReportedByCurrentUser() || userJurisdiction.getUuid().equals(contactJurisdictionDto.getContactOfficerUuid());
+	}
+
     @Override
     protected Disease getDisease() {
         return null;

diff --git a/...as-app/app/src/main/java/de/symeda/sormas/app/backend/contact/ContactJurisdictionDto.java b/...as-app/app/src/main/java/de/symeda/sormas/app/backend/contact/ContactJurisdictionDto.java
@@ -45,6 +45,8 @@ public class ContactJurisdictionDto implements Serializable {
 
 	private CaseJurisdictionDto caseJurisdiction;
 
+	private String contactOfficerUuid;
+
 	public ContactJurisdictionDto() {
 
 	}
@@ -110,4 +112,13 @@ public List<String> getSampleLabUuids() {
 	public void setSampleLabUuids(List<String> sampleLabUuids) {
 		this.sampleLabUuids = sampleLabUuids;
 	}
+
+	public String getContactOfficerUuid() {
+		return contactOfficerUuid;
+	}
+
+	public ContactJurisdictionDto setContactOfficerUuid(String contactOfficerUuid) {
+		this.contactOfficerUuid = contactOfficerUuid;
+		return this;
+	}
 }
diff --git a/...ava/de/symeda/sormas/app/backend/environment/EnvironmentJurisdictionBooleanValidator.java b/...ava/de/symeda/sormas/app/backend/environment/EnvironmentJurisdictionBooleanValidator.java
@@ -32,9 +32,20 @@ public Boolean isRootInJurisdiction() {
 
 	@Override
 	public Boolean isRootInJurisdictionOrOwned() {
-		return userJurisdiction.getUuid().equals(environmentJurisdiction.getReportingUserUuid())
-			|| userJurisdiction.getUuid().equals(environmentJurisdiction.getResponsibleUserUuid())
-			|| inJurisdiction();
+		return isReportedByCurrentUser() || isResponsibleByCurrentUser() || inJurisdiction();
+	}
+
+	private boolean isReportedByCurrentUser() {
+		return userJurisdiction.getUuid().equals(environmentJurisdiction.getReportingUserUuid());
+	}
+
+	private boolean isResponsibleByCurrentUser() {
+		return userJurisdiction.getUuid().equals(environmentJurisdiction.getResponsibleUserUuid());
+	}
+
+	@Override
+	public Boolean isRootInJurisdictionForRestrictedAccess() {
+		return isReportedByCurrentUser() || isResponsibleByCurrentUser();
 	}
 
 	@Override

diff --git a/.../backend/environment/environmentsample/EnvironmentSampleJurisdictionBooleanValidator.java b/.../backend/environment/environmentsample/EnvironmentSampleJurisdictionBooleanValidator.java
@@ -51,7 +51,16 @@ public Boolean isRootInJurisdiction() {
 
 	@Override
 	public Boolean isRootInJurisdictionOrOwned() {
-		return userJurisdiction.getUuid().equals(environmentSampleJurisdiction.getReportingUserUuid()) || inJurisdiction();
+		return isReportedByCurrentUser() || inJurisdiction();
+	}
+
+	private boolean isReportedByCurrentUser() {
+		return userJurisdiction.getUuid().equals(environmentSampleJurisdiction.getReportingUserUuid());
+	}
+
+	@Override
+	public Boolean isRootInJurisdictionForRestrictedAccess() {
+		return isReportedByCurrentUser() || userJurisdiction.getUuid().equals(environmentSampleJurisdiction.getEnvironmentResponsibleUser());
 	}
 
 	@Override

diff --git a/...da/sormas/app/backend/environment/environmentsample/EnvironmentSampleJurisdictionDto.java b/...da/sormas/app/backend/environment/environmentsample/EnvironmentSampleJurisdictionDto.java
@@ -23,6 +23,7 @@ public class EnvironmentSampleJurisdictionDto implements Serializable {
 	private String regionUuid;
 	private String districtUuid;
 	private String communityUuid;
+	private String environmentResponsibleUser;
 
 	public EnvironmentSampleJurisdictionDto() {
 	}
@@ -67,4 +68,11 @@ public void setCommunityUuid(String communityUuid) {
 		this.communityUuid = communityUuid;
 	}
 
+	public String getEnvironmentResponsibleUser() {
+		return environmentResponsibleUser;
+	}
+
+	public void setEnvironmentResponsibleUser(String environmentResponsibleUser) {
+		this.environmentResponsibleUser = environmentResponsibleUser;
+	}
 }
diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/backend/event/EventDao.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/backend/event/EventDao.java
@@ -39,7 +39,9 @@
 import de.symeda.sormas.app.backend.common.DaoException;
 import de.symeda.sormas.app.backend.common.DatabaseHelper;
 import de.symeda.sormas.app.backend.config.ConfigProvider;
+import de.symeda.sormas.app.backend.contact.Contact;
 import de.symeda.sormas.app.backend.location.Location;
+import de.symeda.sormas.app.backend.person.Person;
 import de.symeda.sormas.app.backend.task.Task;
 import de.symeda.sormas.app.util.DiseaseConfigurationCache;
 import de.symeda.sormas.app.util.LocationService;
@@ -260,4 +262,19 @@ private QueryBuilder<Event, Long> buildQueryBuilder(EventCriteria criteria) thro
 
 		return queryBuilder;
 	}
+	public List<Event> getByEventParticipantPerson(Person person){
+		try {
+			QueryBuilder<Event, Long> queryBuilder = queryBuilder();
+			QueryBuilder<EventParticipant, Long> eventParticipantBuilder = DatabaseHelper.getEventParticipantDao().queryBuilder();
+			queryBuilder.leftJoin(eventParticipantBuilder);
+			Where<EventParticipant, Long> where = eventParticipantBuilder.where();
+
+			where.eq(EventParticipant.PERSON + "_id", person.getId());
+
+			return queryBuilder.query();
+		} catch (SQLException e) {
+			Log.e(getTableName(), "Could not perform queryByCriteria on Event");
+			throw new RuntimeException(e);
+		}
+	}
 }
diff --git a/...p/src/main/java/de/symeda/sormas/app/backend/event/EventJurisdictionBooleanValidator.java b/...p/src/main/java/de/symeda/sormas/app/backend/event/EventJurisdictionBooleanValidator.java
@@ -43,10 +43,23 @@ public Boolean isRootInJurisdiction() {
         return isInJurisdictionByJurisdictionLevel(userJurisdiction.getJurisdictionLevel());
     }
 
-    @Override
-    public Boolean isRootInJurisdictionOrOwned() {
-        return userJurisdiction.getUuid().equals(eventJurisdictionDto.getReportingUserUuid()) || userJurisdiction.getUuid().equals(eventJurisdictionDto.getResponsibleUserUuid()) || inJurisdiction();
-    }
+	@Override
+	public Boolean isRootInJurisdictionOrOwned() {
+		return getReportedByCurrentUser() || isCurrentUserResponsible() || inJurisdiction();
+	}
+
+	private boolean getReportedByCurrentUser() {
+		return userJurisdiction.getUuid().equals(eventJurisdictionDto.getReportingUserUuid());
+	}
+
+	public boolean isCurrentUserResponsible() {
+		return userJurisdiction.getUuid().equals(eventJurisdictionDto.getResponsibleUserUuid());
+	}
+
+	@Override
+	public Boolean isRootInJurisdictionForRestrictedAccess() {
+		return getReportedByCurrentUser() || isCurrentUserResponsible();
+	}
 
     @Override
     protected Disease getDisease() {

diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/backend/event/EventJurisdictionDto.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/backend/event/EventJurisdictionDto.java
@@ -56,8 +56,9 @@ public String getResponsibleUserUuid() {
 		return responsibleUserUuid;
 	}
 
-	public void setResponsibleUserUuid(String responsibleUserUuid) {
+	public EventJurisdictionDto setResponsibleUserUuid(String responsibleUserUuid) {
 		this.responsibleUserUuid = responsibleUserUuid;
+		return this;
 	}
 
 	public String getRegionUuid() {

diff --git a/...java/de/symeda/sormas/app/backend/event/EventParticipantJurisdictionBooleanValidator.java b/...java/de/symeda/sormas/app/backend/event/EventParticipantJurisdictionBooleanValidator.java
@@ -48,7 +48,16 @@ public Boolean isRootInJurisdiction() {
 
 	@Override
 	public Boolean isRootInJurisdictionOrOwned() {
-		return userJurisdiction.getUuid().equals(eventParticipantJurisdictionDto.getReportingUserUuid()) || inJurisdiction();
+		return getReportedByCurrentUser() || inJurisdiction();
+	}
+
+	private boolean getReportedByCurrentUser() {
+		return userJurisdiction.getUuid().equals(eventParticipantJurisdictionDto.getReportingUserUuid());
+	}
+
+	@Override
+	public Boolean isRootInJurisdictionForRestrictedAccess() {
+		return getReportedByCurrentUser() || userJurisdiction.getUuid().equals(eventParticipantJurisdictionDto.getEventResponsibleUserUuid());
 	}
 
 	@Override

diff --git a/...app/src/main/java/de/symeda/sormas/app/backend/event/EventParticipantJurisdictionDto.java b/...app/src/main/java/de/symeda/sormas/app/backend/event/EventParticipantJurisdictionDto.java
@@ -28,6 +28,7 @@ public class EventParticipantJurisdictionDto implements Serializable {
 	private String districtUuid;
 	private String eventUuid;
 	private EventJurisdictionDto eventJurisdictionDto;
+	private String eventResponsibleUserUuid;
 
 	public EventParticipantJurisdictionDto() {
 	}
@@ -96,4 +97,12 @@ public EventJurisdictionDto getEventJurisdictionDto() {
 	public void setEventJurisdictionDto(EventJurisdictionDto eventJurisdictionDto) {
 		this.eventJurisdictionDto = eventJurisdictionDto;
 	}
+
+	public String getEventResponsibleUserUuid() {
+		return eventResponsibleUserUuid;
+	}
+
+	public void setEventResponsibleUserUuid(String eventResponsibleUserUuid) {
+		this.eventResponsibleUserUuid = eventResponsibleUserUuid;
+	}
 }
diff --git a/...a/de/symeda/sormas/app/backend/immunization/ImmunizationJurisdictionBooleanValidator.java b/...a/de/symeda/sormas/app/backend/immunization/ImmunizationJurisdictionBooleanValidator.java
@@ -15,9 +15,14 @@
 
 package de.symeda.sormas.app.backend.immunization;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import de.symeda.sormas.api.Disease;
 import de.symeda.sormas.api.utils.DataHelper;
+import de.symeda.sormas.app.backend.caze.CaseJurisdictionDto;
 import de.symeda.sormas.app.backend.caze.ResponsibleJurisdictionDto;
+import de.symeda.sormas.app.backend.person.PersonJurisdictionBooleanValidator;
 import de.symeda.sormas.app.util.BooleanJurisdictionValidator;
 import de.symeda.sormas.app.util.UserJurisdiction;
 
@@ -48,6 +53,13 @@ public Boolean isRootInJurisdictionOrOwned() {
 		return userJurisdiction.getUuid().equals(immunizationJurisdiction.getReportingUserUuid()) || inJurisdiction();
 	}
 
+	@Override
+	public Boolean isRootInJurisdictionForRestrictedAccess() {
+		PersonJurisdictionBooleanValidator personJurisdictionBooleanValidator = new PersonJurisdictionBooleanValidator(userJurisdiction, immunizationJurisdiction.getPersonJurisdiction());
+
+		return isRootInJurisdictionOrOwned() && personJurisdictionBooleanValidator.isRootInJurisdictionForRestrictedAccess();
+	}
+
 	@Override
 	protected Disease getDisease() {
 		return null;