Adding new endpoint for the institution detail view (#313)

Added new Endpoint for the repositories in the institution detail view as the repos were filtered with full text search instead of only filtering the institutions see #311 Co-authored-by: Joel <[email protected]>
digital-sustainability · Sep 25, 2023 · 64f1d57 · 64f1d57
1 parent 5948299
commit 64f1d57
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 3 deletions.
diff --git a/frontend/src/app/data.service.ts b/frontend/src/app/data.service.ts
@@ -78,6 +78,25 @@ export class DataService {
     return repoData;
   }
 
+  async loadRepoDataDetailView(config: {
+    search?: string;
+    sort?: string;
+    direction?: 'ASC' | 'DESC';
+    page?: string;
+    count?: string;
+    includeForks?: string;
+  }) {
+    const repoData = await this.http
+      .get<{
+        repositories: Repository[];
+        total: number;
+      }>(`${environment.api}institutionRepositories`, {
+        params: config,
+      })
+      .toPromise();
+    return repoData;
+  }
+
   async loadUserData(config: {
     search: string;
     sort: string;

diff --git a/frontend/src/app/institution-detail-view/institution-detail-view.component.ts b/frontend/src/app/institution-detail-view/institution-detail-view.component.ts
@@ -259,7 +259,7 @@ export class InstitutionDetailViewComponent implements OnInit {
 
   reloadData() {
     this.dataService
-      .loadRepoData({
+      .loadRepoDataDetailView({
         sort: this.activeSort,
         direction: this.sortDirection,
         page: this.page.toString(),

diff --git a/oss-api/src/api/api.controller.ts b/oss-api/src/api/api.controller.ts
@@ -73,7 +73,7 @@ export class ApiController {
     @Query() queryDto: RepositoryQueryDto,
   ): Promise<RepositoryApiResponse> {
     const queryConfig = queryDto;
-    return await this.handleRepositories(queryConfig);
+    return await this.handleRepositories(queryConfig, false);
   }
 
   @Get('paginatedUsers')
@@ -83,6 +83,15 @@ export class ApiController {
     return await this.handleUsers(queryConfig);
   }
 
+  @Get('institutionRepositories')
+  @UsePipes(new RepositoryQueryPipe(), new ValidationPipe({ transform: true }))
+  async findRepositoriesDetailView(
+    @Query() queryDto: RepositoryQueryDto,
+  ): Promise<RepositoryApiResponse> {
+    const queryConfig = queryDto;
+    return await this.handleRepositories(queryConfig, true);
+  }
+
   @Get('latestUpdate')
   async findLatestUpdate() {
     return (await this.mongoDbService.latestUpdate())[0];
@@ -139,17 +148,22 @@ export class ApiController {
    */
   private async handleRepositories(
     queryConfig: RepositoryQueryConfig,
+    detailedView: boolean,
   ): Promise<RepositoryApiResponse> {
     const includeForks = queryConfig.includeForks ? [false, true] : [false];
     let condition: Object[] = [
       {
         fork: { $in: includeForks },
       },
     ];
-    if (queryConfig.search.length > 0) {
+    if (queryConfig.search.length > 0 && !detailedView) {
       condition.push({
         $text: { $search: queryConfig.search },
       });
+    } else if (detailedView) {
+      condition.push({
+        institution: queryConfig.search,
+      });
     }
     let repositories = await this.mongoDbService.findRepositoryWithConditions(
       queryConfig.sort,