Tenant management

src/domain/model/tenant.ts

@@ -52,7 +52,11 @@ export class Tenant extends BaseEntity {
 
     @instanceMethod
     update(tenant: Partial<this>): void {
-        if (this.name) this.setName(tenant.name as string);
-        if (this.description) this.setDescription(tenant.description as string);
+        if (tenant.name)
+            this.setName(tenant.name
+                .replace(/\s/g, "")
+                .toUpperCase() as string);
+        if (tenant.description)
+            this.setDescription(tenant.description as string);
     }
 }

src/index.ts

@@ -1,5 +1,6 @@
 import "reflect-metadata";
 import { bootstrap } from "./infrastructure/bootstrapping";
+import { winstonLoggerInstance } from "./infrastructure/bootstrapping/loaders/logger";
 import { config } from "./infrastructure/config";
 import { referenceDataIoCModule } from "./infrastructure/config/inversify.config";
 import { iocContainer } from "./infrastructure/config/ioc";
@@ -16,6 +17,7 @@ export async function startServer(connStr: string, port: number) {
             containerModules: [referenceDataIoCModule]
         });
         startAppServer(app, port);
+        winstonLoggerInstance.info(`✔️  Server listening on port: ${port}\n`);
     } catch (error) {
         exitProcess(error);
         throw error;

src/infrastructure/utils/server_utils.ts

@@ -15,7 +15,6 @@ export function startAppServer(app: App, serverPort?: number): Server {
     return app.listen(port, (error: any) => {
         if (error) exitProcess(error);
         iocContainer.bind<App>(TYPES.App).toConstantValue(app);
-        log.info(`✔️  Server listening on port: ${port}\n`);
     });
 }
 export function isIdValid(id: string): boolean {

src/ui/api/controllers/tenant_controller.ts

@@ -2,12 +2,26 @@ import http from "http";
 import { plainToClass } from "class-transformer";
 import httpStatus from "http-status-codes";
 import { inject } from "inversify";
-import { Body, Delete, Get, Post, Route, Security, Tags, Response } from "tsoa";
+import {
+    Body,
+    Delete,
+    Get,
+    Post,
+    Route,
+    Security,
+    Tags,
+    Response,
+    Put
+} from "tsoa";
 import { provideSingleton } from "../../../infrastructure/config/ioc";
 import { isIdValid } from "../../../infrastructure/utils/server_utils";
 import { HttpError } from "../../error";
 import { ITenantService } from "../../interfaces/tenant_service";
-import { CreateTenantInput, TenantDto } from "../../models/tenant_dto";
+import {
+    CreateTenantInput,
+    TenantDto,
+    TenantUpdateInput
+} from "../../models/tenant_dto";
 import { TenantService } from "../../services/tenant_service";
 import { BaseController } from "./base_controller";
 
@@ -23,6 +37,11 @@ export class TenantController extends BaseController {
         if (!tenant) throw new HttpError(httpStatus.NOT_FOUND);
         return tenant;
     }
+    @Get()
+    @Security("X-Auth-Token", ["admin"])
+    public async getAll(): Promise<TenantDto[]> {
+        return this._tenantService.getAll();
+    }
     @Post()
     @Security("X-Auth-Token", ["admin"])
     @Response(httpStatus.FORBIDDEN, http.STATUS_CODES[httpStatus.FORBIDDEN])
@@ -31,6 +50,19 @@ export class TenantController extends BaseController {
         await this.checkConflict(await this._tenantService.get(input.name));
         return this._tenantService.create(input.name, input.description);
     }
+    @Put("{id}")
+    @Security("X-Auth-Token", ["admin"])
+    public async update(
+        id: string,
+        @Body() input: TenantUpdateInput
+    ): Promise<void> {
+        this.checkUUID(id);
+
+        if (!input) return this.setStatus(httpStatus.NO_CONTENT);
+        await this.checkBadRequest(plainToClass(TenantUpdateInput, input));
+        input = JSON.parse(JSON.stringify(input));
+        await this._tenantService.update({ ...input, id });
+    }
     @Delete("{id}")
     @Security("X-Auth-Token", ["admin"])
     public async delete(id: string): Promise<void> {

src/ui/api/routes.ts

@@ -77,6 +77,15 @@ const models: TsoaRoute.Models = {
         "additionalProperties": false,
     },
     // WARNING: This file was auto-generated with tsoa. Please do not modify it. Re-run tsoa to re-generate this file: https://github.com/lukeautry/tsoa
+    "TenantUpdateInput": {
+        "dataType": "refObject",
+        "properties": {
+            "name": { "dataType": "string" },
+            "description": { "dataType": "string" },
+        },
+        "additionalProperties": false,
+    },
+    // WARNING: This file was auto-generated with tsoa. Please do not modify it. Re-run tsoa to re-generate this file: https://github.com/lukeautry/tsoa
     "UserUpdateInput": {
         "dataType": "refObject",
         "properties": {
@@ -175,6 +184,31 @@ export function RegisterRoutes(app: express.Express) {
             promiseHandler(controller, promise, response, next);
         });
     // WARNING: This file was auto-generated with tsoa. Please do not modify it. Re-run tsoa to re-generate this file: https://github.com/lukeautry/tsoa
+    app.get('/api/v1/tenants',
+        authenticateMiddleware([{ "X-Auth-Token": ["admin"] }]),
+        function(request: any, response: any, next: any) {
+            const args = {
+            };
+
+            // WARNING: This file was auto-generated with tsoa. Please do not modify it. Re-run tsoa to re-generate this file: https://github.com/lukeautry/tsoa
+
+            let validatedArgs: any[] = [];
+            try {
+                validatedArgs = getValidatedArgs(args, request);
+            } catch (err) {
+                return next(err);
+            }
+
+            const controller = iocContainer.get<TenantController>(TenantController);
+            if (typeof controller['setStatus'] === 'function') {
+                (<any>controller).setStatus(undefined);
+            }
+
+
+            const promise = controller.getAll.apply(controller, validatedArgs as any);
+            promiseHandler(controller, promise, response, next);
+        });
+    // WARNING: This file was auto-generated with tsoa. Please do not modify it. Re-run tsoa to re-generate this file: https://github.com/lukeautry/tsoa
     app.post('/api/v1/tenants',
         authenticateMiddleware([{ "X-Auth-Token": ["admin"] }]),
         function(request: any, response: any, next: any) {
@@ -201,6 +235,33 @@ export function RegisterRoutes(app: express.Express) {
             promiseHandler(controller, promise, response, next);
         });
     // WARNING: This file was auto-generated with tsoa. Please do not modify it. Re-run tsoa to re-generate this file: https://github.com/lukeautry/tsoa
+    app.put('/api/v1/tenants/:id',
+        authenticateMiddleware([{ "X-Auth-Token": ["admin"] }]),
+        function(request: any, response: any, next: any) {
+            const args = {
+                id: { "in": "path", "name": "id", "required": true, "dataType": "string" },
+                input: { "in": "body", "name": "input", "required": true, "ref": "TenantUpdateInput" },
+            };
+
+            // WARNING: This file was auto-generated with tsoa. Please do not modify it. Re-run tsoa to re-generate this file: https://github.com/lukeautry/tsoa
+
+            let validatedArgs: any[] = [];
+            try {
+                validatedArgs = getValidatedArgs(args, request);
+            } catch (err) {
+                return next(err);
+            }
+
+            const controller = iocContainer.get<TenantController>(TenantController);
+            if (typeof controller['setStatus'] === 'function') {
+                (<any>controller).setStatus(undefined);
+            }
+
+
+            const promise = controller.update.apply(controller, validatedArgs as any);
+            promiseHandler(controller, promise, response, next);
+        });
+    // WARNING: This file was auto-generated with tsoa. Please do not modify it. Re-run tsoa to re-generate this file: https://github.com/lukeautry/tsoa
     app.delete('/api/v1/tenants/:id',
         authenticateMiddleware([{ "X-Auth-Token": ["admin"] }]),
         function(request: any, response: any, next: any) {

src/ui/interfaces/tenant_service.ts

@@ -1,8 +1,11 @@
 import { TenantDto } from "../models/tenant_dto";
+import { Tenant } from "../../domain/model/tenant";
 
 export interface ITenantService {
+    update(tenant: Partial<Tenant>): Promise<void>;
     create(name: string, description: string): Promise<TenantDto>;
     get(name: string): Promise<TenantDto | undefined>;
+    getAll(): Promise<TenantDto[]>;
     delete(id: string): Promise<boolean>;
     search(): Promise<TenantDto[]>;
 }

src/ui/models/base_dto.ts

@@ -8,4 +8,8 @@ export abstract class BaseEntityDto {
     @Expose()
     id!: string;
 }
+export abstract class PagedResultDto<T> {
+    totalCount: number;
+    items: [T];
+}
 export abstract class BaseUpdateDto extends BaseEntityDto {}

src/ui/models/tenant_dto.ts

@@ -1,4 +1,10 @@
-import { IsNotEmpty, MaxLength, IsString, IsBoolean } from "class-validator";
+import {
+    IsNotEmpty,
+    MaxLength,
+    IsString,
+    IsBoolean,
+    IsOptional
+} from "class-validator";
 import { Expose } from "class-transformer";
 
 import { MAX_NAME_LENGTH } from "../../domain/model/user";
@@ -13,6 +19,17 @@ export class CreateTenantInput extends BaseCreateEntityDto {
     @IsNotEmpty()
     description: string;
 }
+export class TenantUpdateInput {
+    @MaxLength(MAX_NAME_LENGTH)
+    @IsNotEmpty()
+    @IsOptional()
+    @IsString()
+    name?: string;
+    @MaxLength(MAX_NAME_LENGTH)
+    @IsOptional()
+    @IsNotEmpty()
+    description?: string;
+}
 export class TenantDto extends BaseEntityDto {
     @MaxLength(MAX_NAME_LENGTH)
     @IsNotEmpty()

src/ui/services/tenant_service.ts

@@ -1,10 +1,12 @@
+import httpStatus from "http-status-codes";
 import { plainToClass } from "class-transformer";
 import { ITenantRepository } from "../../domain/interfaces/repositories";
 import { Tenant } from "../../domain/model/tenant";
 import { provideSingleton, inject } from "../../infrastructure/config/ioc";
 import { ITenantService } from "../interfaces/tenant_service";
 import { TenantDto } from "../models/tenant_dto";
 import { TenantRepository } from "../../infrastructure/db/repositories/tenant_repository";
+import { HttpError } from "../error";
 
 @provideSingleton(TenantService)
 export class TenantService implements ITenantService {
@@ -15,10 +17,30 @@ export class TenantService implements ITenantService {
             Tenant.createInstance(name, description)
         );
         return plainToClass(TenantDto, tenant, {
+            enableImplicitConversion: true,
             excludeExtraneousValues: true
         });
     }
+    async update(tenant: Partial<Tenant>): Promise<void> {
+        const tenantToUpdate = await this._tenantRepository.findById(tenant.id);
+        if (!tenantToUpdate)
+            throw new HttpError(
+                httpStatus.NOT_FOUND,
+                `Tenant with ID "${tenant.id}" does not exist`
+            );
+
+        // check that tenantToUpdate does not overwrite an existing tenant name
 
+        tenantToUpdate.update(tenant);
+        await this._tenantRepository.insertOrUpdate(tenantToUpdate);
+    }
+    async getAll(): Promise<TenantDto[]> {
+        const tenants = await this._tenantRepository.findAll();
+        return plainToClass<TenantDto, Tenant>(TenantDto, tenants, {
+            enableImplicitConversion: true,
+            excludeExtraneousValues: true
+        });
+    }
     async get(name: string): Promise<TenantDto | undefined> {
         const tenant = await this._tenantRepository.findOneByQuery({ name });
         const tenantDto =

src/ui/services/user_service.ts

@@ -72,28 +72,6 @@ export class UserService implements IUserService {
                 `User with ID "${user.id}" does not exist`
             );
 
-        // check that userToUpdate does not overwrite an existing email or username
-        let existingUser: User;
-        if (user.email) {
-            existingUser = await this._userRepository.findOneByQuery({
-                email: user.email
-            });
-            if (existingUser)
-                throw new HttpError(
-                    httpStatus.CONFLICT,
-                    `User with email "${user.email}" already exist`
-                );
-        }
-        if (user.username) {
-            existingUser = await this._userRepository.findOneByQuery({
-                username: user.username
-            });
-            if (existingUser)
-                throw new HttpError(
-                    httpStatus.CONFLICT,
-                    `User with username "${user.username}" already exist`
-                );
-        }
         userToUpdate.update(user);
         await this._userRepository.insertOrUpdate(userToUpdate);
     }