Merge branch 'master' into dependabot/npm_and_yarn/nestjs/config-2.3.3

SciCatProject · Jun 13, 2023 · 7fb2f58 · 7fb2f58
2 parents 28192e3 + f838ffd
commit 7fb2f58
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 8 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/published-data/published-data.controller.ts b/src/published-data/published-data.controller.ts
@@ -91,10 +91,33 @@ export class PublishedDataController {
     description: "Database filters to apply when retrieve all published data",
     required: false,
   })
-  async findAll(@Query("filter") filter?: string): Promise<PublishedData[]> {
+  @ApiQuery({
+    name: "limits",
+    description: "Database limits to apply when retrieve all published data",
+    required: false,
+  })
+  async findAll(
+    @Query("filter") filter?: string,
+    @Query("limits") limits?: string,
+    @Query("fields") fields?: string,
+  ): Promise<PublishedData[]> {
     const publishedDataFilters: IPublishedDataFilters = JSON.parse(
       filter ?? "{}",
     );
+    const publishedDataLimits: {
+      skip: number;
+      limit: number;
+      order: string;
+    } = JSON.parse(limits ?? "{}");
+    const publishedDataFields = JSON.parse(fields ?? "{}");
+
+    if (!publishedDataFilters.limits) {
+      publishedDataFilters.limits = publishedDataLimits;
+    }
+    if (!publishedDataFilters.fields) {
+      publishedDataFilters.fields = publishedDataFields;
+    }
+
     return this.publishedDataService.findAll(publishedDataFilters);
   }
 

diff --git a/src/published-data/published-data.service.ts b/src/published-data/published-data.service.ts
@@ -7,6 +7,7 @@ import {
   parseLimitFilters,
   addCreatedByFields,
   addUpdatedByField,
+  createFullqueryFilter,
 } from "src/common/utils";
 import { CreatePublishedDataDto } from "./dto/create-published-data.dto";
 import { UpdatePublishedDataDto } from "./dto/update-published-data.dto";
@@ -44,10 +45,21 @@ export class PublishedDataService {
 
   async findAll(filter: IPublishedDataFilters): Promise<PublishedData[]> {
     const whereFilter: FilterQuery<PublishedDataDocument> = filter.where ?? {};
+    const fields = filter.fields ?? {};
+    const filterQuery: FilterQuery<PublishedDataDocument> =
+      createFullqueryFilter<PublishedDataDocument>(
+        this.publishedDataModel,
+        "doi",
+        fields,
+      );
+    const whereClause: FilterQuery<PublishedDataDocument> = {
+      ...filterQuery,
+      ...whereFilter,
+    };
     const { limit, skip, sort } = parseLimitFilters(filter.limits);
 
     return this.publishedDataModel
-      .find(whereFilter)
+      .find(whereClause)
       .limit(limit)
       .skip(skip)
       .sort(sort)