Public profile organization: 40

apps/api-gateway/src/organization/organization.controller.ts

@@ -70,6 +70,66 @@ export class OrganizationController {
 
   }
 
+  /**
+ * 
+ * @param user 
+ * @param orgId 
+ * @param res 
+ * @returns Users list of organization
+ */
+  @Get('/public')
+  @ApiResponse({ status: 200, description: 'Success', type: ApiResponseDto })
+  @ApiOperation({ summary: 'Get public organization list', description: 'Get users list.' })
+  @ApiQuery({
+    name: 'pageNumber',
+    type: Number,
+    required: false
+  })
+  @ApiQuery({
+    name: 'pageSize',
+    type: Number,
+    required: false
+  })
+  @ApiQuery({
+    name: 'search',
+    type: String,
+    required: false
+  })
+  async get(@Query() getAllUsersDto: GetAllOrganizationsDto, @Res() res: Response): Promise<Response> {
+
+    const users = await this.organizationService.getPublicOrganizations(getAllUsersDto);
+    const finalResponse: IResponseType = {
+      statusCode: HttpStatus.OK,
+      message: ResponseMessages.organisation.success.getOrganizations,
+      data: users.response
+    };
+
+    return res.status(HttpStatus.OK).json(finalResponse);
+  }
+
+  @Get('public-profile')
+  @ApiOperation({
+    summary: 'Fetch user details',
+    description: 'Fetch user details'
+  })
+  @ApiQuery({
+    name: 'id',
+    type: Number,
+    required: false
+  })
+  async getPublicProfile(@User() reqUser: user, @Query('id') id: number, @Res() res: Response): Promise<object> {
+    const userData = await this.organizationService.getPublicProfile(id);
+
+    const finalResponse: IResponseType = {
+      statusCode: HttpStatus.OK,
+      message: ResponseMessages.organisation.success.fetchProfile,
+      data: userData.response
+    };
+
+    return res.status(HttpStatus.OK).json(finalResponse);
+
+  }
+
   @Get('/roles')
   @ApiOperation({
     summary: 'Fetch org-roles details',

apps/api-gateway/src/organization/organization.service.ts

@@ -11,123 +11,136 @@ import { UpdateOrganizationDto } from './dtos/update-organization-dto';
 
 @Injectable()
 export class OrganizationService extends BaseService {
+  constructor(@Inject('NATS_CLIENT') private readonly serviceProxy: ClientProxy) {
+    super('OrganizationService');
+  }
 
-    constructor(
-        @Inject('NATS_CLIENT') private readonly serviceProxy: ClientProxy
-    ) {
-        super('OrganizationService');
+  /**
+   *
+   * @param createOrgDto
+   * @returns Organization creation Success
+   */
+  async createOrganization(createOrgDto: CreateOrganizationDto, userId: number): Promise<object> {
+    try {
+      const payload = { createOrgDto, userId };
+      return this.sendNats(this.serviceProxy, 'create-organization', payload);
+    } catch (error) {
+      this.logger.error(`In service Error: ${error}`);
+      throw new RpcException(error.response);
     }
+  }
 
-    /**
-     * 
-     * @param createOrgDto 
-     * @returns Organization creation Success
-     */
-    async createOrganization(createOrgDto: CreateOrganizationDto, userId: number): Promise<object> {
-        try {
-            const payload = { createOrgDto, userId };
-            return this.sendNats(this.serviceProxy, 'create-organization', payload);
-        } catch (error) {
-            this.logger.error(`In service Error: ${error}`);
-            throw new RpcException(error.response);
-        }
+  /**
+   *
+   * @param updateOrgDto
+   * @returns Organization update Success
+   */
+  async updateOrganization(updateOrgDto: UpdateOrganizationDto, userId: number): Promise<object> {
+    try {
+      const payload = { updateOrgDto, userId };
+      return this.sendNats(this.serviceProxy, 'update-organization', payload);
+    } catch (error) {
+      this.logger.error(`In service Error: ${error}`);
+      throw new RpcException(error.response);
     }
+  }
 
-    /**
- * 
- * @param updateOrgDto 
- * @returns Organization update Success
- */
-    async updateOrganization(updateOrgDto: UpdateOrganizationDto, userId: number): Promise<object> {
-        try {
-            const payload = { updateOrgDto, userId };
-            return this.sendNats(this.serviceProxy, 'update-organization', payload);
-        } catch (error) {
-            this.logger.error(`In service Error: ${error}`);
-            throw new RpcException(error.response);
-        }
-    }
+  /**
+   *
+   * @param
+   * @returns Organizations details
+   */
+  async getOrganizations(getAllOrgsDto: GetAllOrganizationsDto, userId: number): Promise<{ response: object }> {
+    const payload = { userId, ...getAllOrgsDto };
+    return this.sendNats(this.serviceProxy, 'get-organizations', payload);
+  }
 
+  /**
+   *
+   * @param
+   * @returns Public organizations list
+   */
+  async getPublicOrganizations(getAllOrgsDto: GetAllOrganizationsDto): Promise<{ response: object }> {
+    const payload = { ...getAllOrgsDto };
+    return this.sendNats(this.serviceProxy, 'get-public-organizations', payload);
+  }
 
-    /**
-  * 
-  * @param 
-  * @returns Organizations details
-  */
-    async getOrganizations(getAllOrgsDto: GetAllOrganizationsDto, userId: number): Promise<{ response: object }> {
-        const payload = { userId, ...getAllOrgsDto };
-        return this.sendNats(this.serviceProxy, 'get-organizations', payload);
+  async getPublicProfile(id: number): Promise<{ response: object }> {
+    const payload = { id };
+    try {
+      return this.sendNats(this.serviceProxy, 'get-organization-public-profile', payload);
+    } catch (error) {
+      this.logger.error(`Error in get user:${JSON.stringify(error)}`);
     }
+  }
 
+  /**
+   *
+   * @param orgId
+   * @returns Organization get Success
+   */
+  async getOrganization(orgId: number, userId: number): Promise<{ response: object }> {
+    const payload = { orgId, userId };
+    return this.sendNats(this.serviceProxy, 'get-organization-by-id', payload);
+  }
 
-    /**
-     * 
-     * @param orgId 
-     * @returns Organization get Success
-     */
-    async getOrganization(orgId: number, userId: number): Promise<{ response: object }> {
-        const payload = { orgId, userId };
-        return this.sendNats(this.serviceProxy, 'get-organization-by-id', payload);
-    }
+  /**
+   *
+   * @param orgId
+   * @returns Invitations details
+   */
+  async getInvitationsByOrgId(
+    orgId: number,
+    getAllInvitationsDto: GetAllSentInvitationsDto
+  ): Promise<{ response: object }> {
+    const { pageNumber, pageSize, search } = getAllInvitationsDto;
+    const payload = { orgId, pageNumber, pageSize, search };
+    return this.sendNats(this.serviceProxy, 'get-invitations-by-orgId', payload);
+  }
 
-    /**
- * 
- * @param orgId 
- * @returns Invitations details
- */
-    async getInvitationsByOrgId(orgId: number, getAllInvitationsDto: GetAllSentInvitationsDto): Promise<{ response: object }> {
-        const { pageNumber, pageSize, search } = getAllInvitationsDto;
-        const payload = { orgId, pageNumber, pageSize, search };
-        return this.sendNats(this.serviceProxy, 'get-invitations-by-orgId', payload);
-    }
+  async getOrganizationDashboard(orgId: number, userId: number): Promise<{ response: object }> {
+    const payload = { orgId, userId };
+    return this.sendNats(this.serviceProxy, 'get-organization-dashboard', payload);
+  }
 
-    async getOrganizationDashboard(orgId: number, userId: number): Promise<{ response: object }> {
-        const payload = { orgId, userId };
-        return this.sendNats(this.serviceProxy, 'get-organization-dashboard', payload);
+  /**
+   *
+   * @param
+   * @returns get organization roles
+   */
+  async getOrgRoles(): Promise<object> {
+    try {
+      const payload = {};
+      return this.sendNats(this.serviceProxy, 'get-org-roles', payload);
+    } catch (error) {
+      this.logger.error(`In service Error: ${error}`);
+      throw new RpcException(error.response);
     }
+  }
 
-    /**
-  * 
-  * @param  
-  * @returns get organization roles
-  */
-    async getOrgRoles(): Promise<object> {
-        try {
-            const payload = {};
-            return this.sendNats(this.serviceProxy, 'get-org-roles', payload);
-        } catch (error) {
-            this.logger.error(`In service Error: ${error}`);
-            throw new RpcException(error.response);
-        }
+  /**
+   *
+   * @param sendInvitationDto
+   * @returns Organization invitation creation Success
+   */
+  async createInvitation(bulkInvitationDto: BulkSendInvitationDto, userId: number): Promise<object> {
+    try {
+      const payload = { bulkInvitationDto, userId };
+      return this.sendNats(this.serviceProxy, 'send-invitation', payload);
+    } catch (error) {
+      this.logger.error(`In service Error: ${error}`);
+      throw new RpcException(error.response);
     }
+  }
 
-
-    /**
-     * 
-     * @param sendInvitationDto 
-     * @returns Organization invitation creation Success
-     */
-    async createInvitation(bulkInvitationDto: BulkSendInvitationDto, userId: number): Promise<object> {
-        try {
-            const payload = { bulkInvitationDto, userId };
-            return this.sendNats(this.serviceProxy, 'send-invitation', payload);
-        } catch (error) {
-            this.logger.error(`In service Error: ${error}`);
-            throw new RpcException(error.response);
-        }
-    }
-
-    /**
-     * 
-     * @param updateUserDto 
-     * @param userId 
-     * @returns User roles update response
-     */
-    async updateUserRoles(
-        updateUserDto: UpdateUserRolesDto,
-        userId: number
-    ): Promise<{ response: boolean }> {
-        const payload = { orgId: updateUserDto.orgId, roleIds: updateUserDto.orgRoleId, userId };
-        return this.sendNats(this.serviceProxy, 'update-user-roles', payload);
-    }
+  /**
+   *
+   * @param updateUserDto
+   * @param userId
+   * @returns User roles update response
+   */
+  async updateUserRoles(updateUserDto: UpdateUserRolesDto, userId: number): Promise<{ response: boolean }> {
+    const payload = { orgId: updateUserDto.orgId, roleIds: updateUserDto.orgRoleId, userId };
+    return this.sendNats(this.serviceProxy, 'update-user-roles', payload);
+  }
 }

apps/api-gateway/src/user/user.controller.ts

@@ -116,10 +116,7 @@ async getOrganizationUsers(@User() user: IUserRequestInterface, @Query() getAllU
  * @param res 
  * @returns Users list of organization
  */
-@Get('/public-users')
-@Roles(OrgRoles.OWNER, OrgRoles.ADMIN, OrgRoles.HOLDER, OrgRoles.ISSUER, OrgRoles.SUPER_ADMIN, OrgRoles.SUPER_ADMIN, OrgRoles.MEMBER)
-@ApiBearerAuth()
-@UseGuards(AuthGuard('jwt'))
+@Get('/public')
 @ApiResponse({ status: 200, description: 'Success', type: ApiResponseDto })
 @ApiOperation({ summary: 'Get users list', description: 'Get users list.' })
 @ApiQuery({
@@ -228,8 +225,6 @@ async get(@User() user: IUserRequestInterface, @Query() getAllUsersDto: GetAllUs
     summary: 'Fetch user details',
     description: 'Fetch user details'
   })
-  @UseGuards(AuthGuard('jwt'))
-  @ApiBearerAuth()
   @ApiQuery({
     name: 'id',
     type: Number,

apps/organization/repositories/organization.repository.ts

@@ -243,11 +243,11 @@ export class OrganizationRepository {
     }
   }
 
-  async getOrganization(orgId: number): Promise<object> {
+  async getOrganization(queryObject: object): Promise<object> {
     try {
-      return this.prisma.organisation.findUnique({
+      return this.prisma.organisation.findFirst({
         where: {
-          id: orgId
+          ...queryObject
         },
         include: {
           org_agents: {