data_viewer_allowed filter for project group

src/assets/user-management-spec.json

@@ -773,6 +773,15 @@
                             }
                         }
                     },
+                    {
+                        "name": "data_viewer_allowed",
+                        "in": "query",
+                        "description": "<strong>Data viewer allowed:</strong> Filters project groups based on whether data viewer access is allowed. Uses a boolean value.",
+                        "required": false,
+                        "schema": {
+                            "type": "boolean"
+                        }
+                    },
                     {
                         "name": "page_no",
                         "in": "query",

src/controller/project-group-controller.ts

@@ -11,7 +11,7 @@ import { ProjectGroupUserQueryParams } from "../model/params/project-group-user-
 import { Utility } from "../utility/utility";
 import queryValidationMiddleware from "../middleware/query-params-validation-middleware";
 import { listRequestValidation } from "../middleware/list-request-validation-middleware";
-import { DatasetViewerDto } from "../model/dto/dataset-viewer-dto";
+import { DatasetViewerDto, FeedbackTurnaroundTime } from "../model/dto/dataset-viewer-dto";
 
 class ProjectGroupController implements IController {
     public path = '';
@@ -40,6 +40,8 @@ class ProjectGroupController implements IController {
         try {
             let projectGroupId = req.params.projectGroupId;
             let datasetViewerConfig = DatasetViewerDto.from(req.body);
+            datasetViewerConfig.feedback_turnaround_time = FeedbackTurnaroundTime.from(datasetViewerConfig.feedback_turnaround_time);
+
             await datasetViewerConfig.validateRequestInput();
             const result = await projectGroupService.updateDatasetViewerConfig(projectGroupId, datasetViewerConfig);
             Ok(res, result);

src/model/dto/dataset-viewer-dto.ts

@@ -11,11 +11,13 @@ export enum TimeUnit {
     YEARS = "years"
 }
 
-export class FeedbackTurnaroundTime {
+export class FeedbackTurnaroundTime extends BaseDto {
+    @Prop()
     @IsNotEmpty()
     @IsNumber()
     number!: number;
 
+    @Prop()
     @IsNotEmpty()
     @IsEnum(TimeUnit)
     units!: TimeUnit;
@@ -39,8 +41,12 @@ export class DatasetViewerDto extends BaseDto {
     }
 
     async validateRequestInput() {
-        const dto = plainToInstance(this.constructor as new () => DatasetViewerDto, this);
-        let errors = await validate(dto);
+        // Ensure nested object exists
+        // if (!this.feedback_turnaround_time) {
+        //     this.feedback_turnaround_time = new FeedbackTurnaroundTime();
+        // }
+        // const dto = plainToInstance(this.constructor as new () => DatasetViewerDto, this);
+        let errors = await validate(this);
         if (errors.length > 0) {
             console.log('Input validation failed');
             let message = errors

src/model/params/project-group-get-query-params.ts

@@ -27,6 +27,9 @@ export class ProjectGroupQueryParams extends AbstractDomainEntity {
     @IsOptional()
     @Prop()
     show_inactive!: boolean;
+    @Prop()
+    @IsOptional()
+    data_viewer_allowed: boolean | undefined;
 
     constructor(init?: Partial<ProjectGroupQueryParams>) {
         super();
@@ -73,9 +76,35 @@ export class ProjectGroupQueryParams extends AbstractDomainEntity {
             //Always pull active project group
             queryObject.condition(` o.is_active = $${queryObject.paramCouter++} `, true);
         }
+        if (this.data_viewer_allowed != undefined) {
+            let dataViewerAllowed = this.toBoolean(this.data_viewer_allowed);
+            if (dataViewerAllowed) {
+                queryObject.condition(
+                    `o.data_viewer_config IS NOT NULL
+                AND (o.data_viewer_config::json ->> 'dataset_viewer_allowed') IS NOT NULL
+                AND (o.data_viewer_config::json ->> 'dataset_viewer_allowed')::boolean = $${queryObject.paramCouter++}`,
+                    this.data_viewer_allowed
+                );
+            } else {
+                queryObject.condition(
+                    `o.data_viewer_config IS NOT NULL
+                AND ( (o.data_viewer_config::json ->> 'dataset_viewer_allowed') IS NULL
+                OR (o.data_viewer_config::json ->> 'dataset_viewer_allowed')::boolean = $${queryObject.paramCouter++})`,
+                    this.data_viewer_allowed
+                );
+            }
+        }
 
         queryObject.buildGroupRaw("group by o.project_group_id, o.name, o.phone, o.address, o.polygon, o.url, o.is_active, ue.enabled ");
 
         return queryObject;
     }
+
+    toBoolean(value: any): boolean {
+        if (typeof value === "boolean") return value;
+        if (typeof value === "string") {
+            return value.toLowerCase() === "true";
+        }
+        return Boolean(value); // fallback: null/undefined -> false, numbers -> truthy/falsy
+    }
 }