Added site/submission filter based on survey visibility setting (#2215)

Co-authored-by: Gino Miceli <[email protected]>

Author: rfontanarosa

web/src/app/services/data-store/data-store.service.ts

@@ -433,14 +433,14 @@ export class DataStoreService {
    *
    * @param survey the survey instance.
    * @param userEmail the email of the user to filter the results.
-   * @param canManageSurvey a flag indicating whether the user has survey organizer or owner level permissions of the survey.
+   * @param canViewAll a flag indicating whether the user has permission to view all LOIs for this survey.
    */
   getAccessibleLois$(
     {id: surveyId}: Survey,
     userId: string,
-    canManageSurvey: boolean
+    canViewAll: boolean
   ): Observable<List<LocationOfInterest>> {
-    if (canManageSurvey) {
+    if (canViewAll) {
       return this.db
         .collection(`${SURVEYS_COLLECTION_NAME}/${surveyId}/lois`)
         .valueChanges({idField: 'id'})
@@ -477,17 +477,17 @@ export class DataStoreService {
    * @param survey the survey instance.
    * @param loi the loi instance.
    * @param userEmail the email of the user to filter the results.
-   * @param canManageSurvey a flag indicating whether the user has survey organizer or owner level permissions of the survey.
+   * @param canViewAll a flag indicating whether the user has permission to view all LOIs for this survey.
    */
   getAccessibleSubmissions$(
     survey: Survey,
     loi: LocationOfInterest,
     userId: string,
-    canManageSurvey: boolean
+    canViewAll: boolean
   ): Observable<List<Submission>> {
     return this.db
       .collection(`${SURVEYS_COLLECTION_NAME}/${survey.id}/submissions`, ref =>
-        this.canViewSubmissions(ref, loi.id, userId, canManageSurvey)
+        this.canViewSubmissions(ref, loi.id, userId, canViewAll)
       )
       .valueChanges({idField: 'id'})
       .pipe(
@@ -621,10 +621,10 @@ export class DataStoreService {
     ref: CollectionReference,
     loiId: string,
     userId: string,
-    canManageSurvey: boolean
+    canViewAll: boolean
   ) {
     const query = ref.where(sb.loiId, '==', loiId);
 
-    return canManageSurvey ? query : query.where(sb.ownerId, '==', userId);
+    return canViewAll ? query : query.where(sb.ownerId, '==', userId);
   }
 }

web/src/app/services/loi/loi.service.ts

@@ -21,7 +21,7 @@ import {map, switchMap} from 'rxjs/operators';
 
 import {GeometryType} from 'app/models/geometry/geometry';
 import {LocationOfInterest} from 'app/models/loi.model';
-import {SurveyState} from 'app/models/survey.model';
+import {SurveyDataVisibility, SurveyState} from 'app/models/survey.model';
 import {AuthService} from 'app/services/auth/auth.service';
 import {DataStoreService} from 'app/services/data-store/data-store.service';
 import {SurveyService} from 'app/services/survey/survey.service';
@@ -52,7 +52,9 @@ export class LocationOfInterestService {
                   : this.dataStore.getAccessibleLois$(
                       survey,
                       user.id,
-                      this.surveyService.canManageSurvey()
+                      this.surveyService.canManageSurvey() ||
+                        survey.dataVisibility ===
+                          SurveyDataVisibility.ALL_SURVEY_PARTICIPANTS
                     )
               )
             )

web/src/app/services/submission/submission.service.ts

@@ -23,7 +23,7 @@ import {AuditInfo} from 'app/models/audit-info.model';
 import {LocationOfInterest} from 'app/models/loi.model';
 import {Result} from 'app/models/submission/result.model';
 import {Submission} from 'app/models/submission/submission.model';
-import {Survey} from 'app/models/survey.model';
+import {Survey, SurveyDataVisibility} from 'app/models/survey.model';
 import {User} from 'app/models/user.model';
 import {AuthService} from 'app/services/auth/auth.service';
 import {DataStoreService} from 'app/services/data-store/data-store.service';
@@ -63,7 +63,9 @@ export class SubmissionService {
                             survey,
                             loi,
                             user.id,
-                            this.surveyService.canManageSurvey()
+                            this.surveyService.canManageSurvey() ||
+                              survey.dataVisibility ===
+                                SurveyDataVisibility.ALL_SURVEY_PARTICIPANTS
                           )
                     )
                   )