implements-search-users-PublishedProjects

api/apps/api/src/modules/published-project/published-project-crud.service.ts

@@ -38,8 +38,26 @@ export class PublishedProjectCrudService extends AppBaseService<
 
   get serializerConfig(): JSONAPISerializerConfig<PublishedProject> {
     return {
-      attributes: ['name', 'description', 'underModeration'],
+      attributes: ['name', 'description', 'underModeration', 'originalProject'],
       keyForAttribute: 'camelCase',
+      originalProject: {
+        ref: 'id',
+        attributes: [
+          'name',
+          'description',
+          'countryId',
+          'adminAreaLevel1Id',
+          'adminAreaLevel2Id',
+          'planningUnitGridShape',
+          'planningUnitAreakm2',
+          'createdAt',
+          'lastModifiedAt',
+          'planningAreaId',
+          'planningAreaName',
+          'bbox',
+          'customProtectedAreas',
+        ],
+      },
     };
   }
 
@@ -50,6 +68,18 @@ export class PublishedProjectCrudService extends AppBaseService<
   ): Promise<SelectQueryBuilder<PublishedProject>> {
     const userId = info?.authenticatedUser?.id;
 
+    const { namesSearch } = info?.params ?? {};
+
+    if (namesSearch) {
+      const namesSearchFilterField = 'namesSearchFilter' as const;
+      query.andWhere(
+        `(${this.alias}.name
+          ||' '|| COALESCE(${this.alias}.description, '')
+          ) ILIKE :${namesSearchFilterField}`,
+        { [namesSearchFilterField]: `%${namesSearch}%` },
+      );
+    }
+
     /*
       If we are listing projects for non-authenticated requests or for
       authenticated users who are not admin, projects under moderation

api/apps/api/src/modules/users/user-requests-info.ts

@@ -0,0 +1,9 @@
+import { AppInfoDTO } from '@marxan-api/dto/info.dto';
+
+export interface UsersRequest extends AppInfoDTO {
+  params?: {
+    featureClassAndAliasFilter?: string;
+    nameSearch?: string;
+  } & AppInfoDTO['params'];
+}
+

api/apps/api/src/modules/users/users.service.ts

@@ -12,7 +12,6 @@ import { User, userResource } from './user.api.entity';
 import { omit } from 'lodash';
 import { CreateUserDTO } from './dto/create.user.dto';
 import { UpdateUserDTO } from './dto/update.user.dto';
-import { AppInfoDTO } from '@marxan-api/dto/info.dto';
 
 import * as faker from 'faker';
 import {
@@ -27,16 +26,18 @@ import { AppConfig } from '@marxan-api/utils/config.utils';
 import { PlatformAdminEntity } from './platform-admin/admin.api.entity';
 import { Either, left, right } from 'fp-ts/lib/Either';
 import { FetchSpecification } from 'nestjs-base-service';
+import { UsersRequest } from './user-requests-info';
 
 export const forbiddenError = Symbol(`unauthorized access`);
 export const badRequestError = Symbol(`operation not allowed`);
 export const userNotFoundError = Symbol(`user not found in database`);
+
 @Injectable()
 export class UsersService extends AppBaseService<
   User,
   CreateUserDTO,
   UpdateUserDTO,
-  AppInfoDTO
+  UsersRequest
 > {
   constructor(
     @InjectRepository(User)
@@ -102,6 +103,28 @@ export class UsersService extends AppBaseService<
     };
   }
 
+  async extendFindAllQuery(
+    query: SelectQueryBuilder<User>,
+    fetchSpecification: FetchSpecification,
+    info?: UsersRequest,
+  ): Promise<SelectQueryBuilder<User>> {
+    const { namesSearch } = info?.params ?? {};
+
+    if (namesSearch) {
+      const namesSearchFilterField = 'namesSearchFilter' as const;
+      query.andWhere(
+        `(${this.alias}.display_name
+          ||' '|| COALESCE(${this.alias}.fname, '')
+          ||' '|| COALESCE(${this.alias}.lname, '')
+          ||' '|| COALESCE(${this.alias}.email, '')
+          ) ILIKE :${namesSearchFilterField}`,
+        { [namesSearchFilterField]: `%${namesSearch}%` },
+      );
+    }
+
+    return query;
+  }
+
   async fakeFindOne(_id: string): Promise<Partial<User>> {
     return {
       ...new User(),
@@ -182,7 +205,7 @@ export class UsersService extends AppBaseService<
   async updateOwnPassword(
     userId: string,
     currentAndNewPasswords: UpdateUserPasswordDTO,
-    _info: AppInfoDTO,
+    _info: UsersRequest,
   ): Promise<void> {
     const user = await this.getById(userId);
     if (
@@ -215,7 +238,7 @@ export class UsersService extends AppBaseService<
   async validateBeforeUpdate(
     id: string,
     updateModel: UpdateUserDTO,
-    _info?: AppInfoDTO,
+    _info?: UsersRequest,
   ): Promise<void> {
     if (updateModel.password) {
       throw new ForbiddenException(
@@ -245,7 +268,7 @@ export class UsersService extends AppBaseService<
   async extendFindAllResults(
     entitiesAndCount: [User[], number],
     _fetchSpecification?: FetchSpecification,
-    _info?: AppInfoDTO,
+    _info?: UsersRequest,
   ): Promise<[User[], number]> {
     const extendedEntities: Promise<User>[] = entitiesAndCount[0].map(
       (entity) => this.extendGetByIdResult(entity),