Merge branch 'develop-x' of https://github.com/inflection-zone/reanca…

…re-service into develop-x
inflection-zone · Feb 2, 2024 · 8d8f7c5 · 8d8f7c5
2 parents 73cfcae + fa5add3
commit 8d8f7c5
Show file tree

Hide file tree

Showing 13 changed files with 151 additions and 115 deletions.
diff --git a/src/api/users/user/user.validator.ts b/src/api/users/user/user.validator.ts
@@ -293,14 +293,14 @@ export class UserValidator {
                 .isNumeric()
                 .run(request);
 
-            await oneOf([
-                body('TenantId')
-                    .trim()
-                    .isUUID(),
-                body('TenantCode')
-                    .trim()
-                    .escape(),
-            ]).run(request);
+            // await oneOf([
+            //     body('TenantId')
+            //         .trim()
+            //         .isUUID(),
+            //     body('TenantCode')
+            //         .trim()
+            //         .escape(),
+            // ]).run(request);
 
             const result = validationResult(request);
             if (!result.isEmpty()) {
@@ -392,14 +392,14 @@ export class UserValidator {
                     .escape(),
             ]).run(request);
 
-            await oneOf([
-                body('TenantId').exists()
-                    .trim()
-                    .isUUID(),
-                body('TenantCode').exists()
-                    .trim()
-                    .escape(),
-            ]).run(request);
+            // await oneOf([
+            //     body('TenantId').exists()
+            //         .trim()
+            //         .isUUID(),
+            //     body('TenantCode').exists()
+            //         .trim()
+            //         .escape(),
+            // ]).run(request);
 
             await body('NewPassword').exists()
                 .trim()
@@ -447,14 +447,14 @@ export class UserValidator {
                     .escape(),
             ]).run(request);
 
-            await oneOf([
-                body('TenantId').exists()
-                    .trim()
-                    .isUUID(),
-                body('TenantCode').exists()
-                    .trim()
-                    .escape(),
-            ]).run(request);
+            // await oneOf([
+            //     body('TenantId').exists()
+            //         .trim()
+            //         .isUUID(),
+            //     body('TenantCode').exists()
+            //         .trim()
+            //         .escape(),
+            // ]).run(request);
 
             await body('Purpose').optional()
                 .trim()
@@ -528,14 +528,14 @@ export class UserValidator {
                 .isNumeric()
                 .run(request);
 
-            await oneOf([
-                body('TenantId').exists()
-                    .trim()
-                    .isUUID(),
-                body('TenantCode').exists()
-                    .trim()
-                    .escape(),
-            ]).run(request);
+            // await oneOf([
+            //     body('TenantId').exists()
+            //         .trim()
+            //         .isUUID(),
+            //     body('TenantCode').exists()
+            //         .trim()
+            //         .escape(),
+            // ]).run(request);
 
             const result = validationResult(request);
             if (!result.isEmpty()) {

diff --git a/src/auth/custom/custom.user.authenticator.ts b/src/auth/custom/custom.user.authenticator.ts
@@ -129,6 +129,7 @@ export class CustomUserAuthenticator implements IUserAuthenticator {
             UserId        : user.id,
             TenantId      : tenant.id,
             TenantCode    : tenant.Code,
+            TenantName    : tenant.Name,
             DisplayName   : user.Person.DisplayName,
             Phone         : user.Person.Phone,
             Email         : user.Person.Email,

diff --git a/src/common/helper.ts b/src/common/helper.ts
@@ -8,7 +8,7 @@ import { generate } from 'generate-password';
 import mime = require('mime-types');
 import path from 'path';
 import { ConfigurationManager } from '../config/configuration.manager';
-import { Gender, OSType } from '../domain.types/miscellaneous/system.types';
+import { Gender, OSType, uuid } from '../domain.types/miscellaneous/system.types';
 import { InputValidationError } from './input.validation.error';
 import { TimeHelper } from './time.helper';
 import Countries from './misc/countries';
@@ -770,4 +770,12 @@ export class Helper {
         }
     };
 
+    public static constructFileDownloadURL = (fileResourceId: uuid): string => {
+        if (!fileResourceId) {
+            return null;
+        }
+        const url = ConfigurationManager.BaseUrl() + '/api/v1/file-resources/' + fileResourceId + '/download';
+        return url;
+    };
+
 }
diff --git a/src/database/repository.interfaces/users/user/user.repo.interface.ts b/src/database/repository.interfaces/users/user/user.repo.interface.ts
@@ -15,6 +15,8 @@ export interface IUserRepo {
 
     getById(id: uuid): Promise<UserDetailsDto>;
 
+    getByPersonId(personId: uuid): Promise<UserDetailsDto>;
+
     updateLastLogin(id: uuid): Promise<void>;
 
     delete(id: uuid): Promise<boolean>;

diff --git a/src/database/sql/sequelize/mappers/person/person.mapper.ts b/src/database/sql/sequelize/mappers/person/person.mapper.ts
@@ -21,6 +21,8 @@ export class PersonMapper {
 
         const age = Helper.getAgeFromBirthDate(person.BirthDate);
 
+        const profileImageURL = Helper.constructFileDownloadURL(person.ImageResourceId);
+
         const dto: PersonDetailsDto = {
             id                   : person.id,
             Prefix               : person.Prefix,
@@ -36,6 +38,7 @@ export class PersonMapper {
             Email                : person.Email,
             TelegramChatId       : person.TelegramChatId,
             ImageResourceId      : person.ImageResourceId,
+            ProfileImageURL      : profileImageURL,
             ActiveSince          : person.CreatedAt,
             Roles                : [],
             Addresses            : []

diff --git a/src/database/sql/sequelize/mappers/users/user/user.mapper.ts b/src/database/sql/sequelize/mappers/users/user/user.mapper.ts
@@ -2,12 +2,13 @@ import User from '../../../models/users/user/user.model';
 import { PersonDetailsDto, PersonDto } from '../../../../../../domain.types/person/person.dto';
 import { UserDetailsDto, UserDto } from '../../../../../../domain.types/users/user/user.dto';
 import Tenant from '../../../models/tenant/tenant.model';
+import Role from '../../../models/role/role.model';
 
 ///////////////////////////////////////////////////////////////////////////////////
 
 export class UserMapper {
 
-    static toDetailsDto = (user: User, tenant: Tenant = null, personDto: PersonDetailsDto = null)
+    static toDetailsDto = (user: User, tenant: Tenant = null, personDto: PersonDetailsDto = null, role: Role = null)
         : UserDetailsDto => {
 
         if (user == null){
@@ -19,13 +20,15 @@ export class UserMapper {
             UserName        : user.UserName,
             PersonId        : user.PersonId,
             TenantId        : user.TenantId ?? tenant?.id,
+            TenantCode      : tenant?.Code,
+            TenantName      : tenant?.Name,
             Person          : personDto,
             IsTestUser      : user.IsTestUser,
             LastLogin       : user.LastLogin,
             DefaultTimeZone : user.DefaultTimeZone,
             CurrentTimeZone : user.CurrentTimeZone,
             RoleId          : user.RoleId,
-            Role            : null
+            Role            : role ?? null,
         };
         return dto;
     };

diff --git a/src/database/sql/sequelize/repositories/users/user/user.repo.ts b/src/database/sql/sequelize/repositories/users/user/user.repo.ts
@@ -12,6 +12,8 @@ import Tenant from '../../../models/tenant/tenant.model';
 import { uuid } from '../../../../../../domain.types/miscellaneous/system.types';
 import { TenantMapper } from '../../../mappers/tenant/tenant.mapper';
 import { TenantDto } from '../../../../../../domain.types/tenant/tenant.dto';
+import { PersonMapper } from '../../../mappers/person/person.mapper';
+import Role from '../../../models/role/role.model';
 
 ///////////////////////////////////////////////////////////////////////////////////
 
@@ -33,6 +35,21 @@ export class UserRepo implements IUserRepo {
         return null;
     };
 
+    getByPersonId = async (personId: string): Promise<UserDetailsDto> => {
+        try {
+            const user = await User.findOne({ where: { PersonId: personId } });
+            const tenant = await Tenant.findByPk(user.TenantId);
+            const person = await Person.findByPk(personId);
+            const role = await Role.findByPk(user.RoleId);
+            const personDto = await PersonMapper.toDetailsDto(person);
+            return UserMapper.toDetailsDto(user, tenant, personDto, role);
+        }
+        catch (error) {
+            Logger.instance().log(error.message);
+            throw new ApiError(500, error.message);
+        }
+    };
+
     getByEmailAndRole = async (email: any, roleId: number): Promise<UserDetailsDto> => {
 
         const person = await Person.findOne({

diff --git a/src/domain.types/miscellaneous/current.user.ts b/src/domain.types/miscellaneous/current.user.ts
@@ -4,6 +4,7 @@ export interface CurrentUser {
     UserId        : string;
     TenantId      : string;
     TenantCode    : string;
+    TenantName    : string;
     DisplayName   : string;
     Phone         : string;
     Email         : string;

diff --git a/src/domain.types/person/person.dto.ts b/src/domain.types/person/person.dto.ts
@@ -25,6 +25,7 @@ export interface PersonDetailsDto {
     LivingAlone?               : boolean;
     WorkedPriorToStroke?       : boolean;
     ImageResourceId            : string;
+    ProfileImageURL           ?: string;
     Roles                      : PersonRoleDto[];
     ActiveSince                : Date;
     Addresses                  : AddressDto[];

diff --git a/src/domain.types/users/user/user.dto.ts b/src/domain.types/users/user/user.dto.ts
@@ -6,6 +6,8 @@ export interface UserDetailsDto {
     id             : uuid;
     PersonId       : uuid;
     TenantId       : uuid;
+    TenantCode    ?: string;
+    TenantName    ?: string;
     Person         : PersonDetailsDto;
     RoleId         : number;
     Role           : RoleDto;

diff --git a/src/services/community/user.group.service.ts b/src/services/community/user.group.service.ts
@@ -11,7 +11,7 @@ import { uuid } from "../../domain.types/miscellaneous/system.types";
 import { Logger } from "../../common/logger";
 import axios from 'axios';
 import { IUserRepo } from "../../database/repository.interfaces/users/user/user.repo.interface";
-import { ConfigurationManager } from "../../config/configuration.manager";
+import { Helper } from "../../common/helper";
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -238,10 +238,8 @@ export class UserGroupService {
                 const user = await this._userRepo.getById(userId);
                 const clientId = await this.getClientId();
                 const fileResourceId = user.Person.ImageResourceId;
-                var profileImageUrl: string | null | undefined = null;
-                if (fileResourceId) {
-                    profileImageUrl = ConfigurationManager.BaseUrl() + '/api/v1/file-resources/' + fileResourceId + '/download';
-                }
+                var profileImageUrl = Helper.constructFileDownloadURL(fileResourceId);
+
                 url = process.env.AWARDS_SERVICE_BASE_URL + '/api/v1/participants';
                 var body = {
                     clientId        : clientId,

diff --git a/src/services/users/patient/patient.service.ts b/src/services/users/patient/patient.service.ts
@@ -104,6 +104,7 @@ export class PatientService {
                 UserId        : items[0].id,
                 TenantId      : tenant.id,
                 TenantCode    : tenant.Code,
+                TenantName    : tenant.Name,
                 DisplayName   : items[0].DisplayName,
                 Phone         : items[0].Phone,
                 Email         : items[0].Email,