fix/project factory class

Author: piotr-szewczyk

lib/src/api/dashboard/dashboard.service.ts

@@ -39,11 +39,12 @@ export class DashboardService {
     project: Project,
     manager: EntityManager = this.entityManager
   ) {
+    const unix = dateUtils.toUnix();
     return await manager.getRepository(Dashboard).save({
       project,
       isEditable: true,
-      createdAt: dateUtils.toUnix(),
-      updatedAt: dateUtils.toUnix(),
+      createdAt: unix,
+      updatedAt: unix,
       ...dto
     });
   }

lib/src/api/project/project.factory.ts

@@ -0,0 +1,90 @@
+import { Injectable } from "@nestjs/common";
+import dateUtils from "../../common/helpers/dateUtils";
+import { gravatar } from "../../common/helpers/gravatar";
+import { uuidService } from "../../common/helpers/uuid";
+import { CreateProjectDto } from "../../common/types/dto/project.dto";
+import { Project } from "../../db/entities/project.entity";
+import { User } from "../../db/entities/user.entity";
+import { EntityManager } from "typeorm";
+import { MemberService } from "../member/member.service";
+import { UserQueryService } from "../user/user-query/user-query.service";
+import { ADMIN_EMAIL, ADMIN_NAME } from "../../common/helpers/constants";
+import { MemberRole } from "@traceo/types";
+import { RequestContext } from "../../common/middlewares/request-context/request-context.model";
+import { DashboardService } from "../dashboard/dashboard.service";
+
+@Injectable()
+export class ProjectFactory {
+
+    constructor(
+        private readonly manager: EntityManager,
+        private readonly memberService: MemberService,
+        private readonly userQueryService: UserQueryService,
+        private readonly dashboardService: DashboardService
+    ) { }
+
+    public async create(user: User, dto: CreateProjectDto, manager = this.manager) {
+        const { username } = RequestContext.user
+        const unix = dateUtils.toUnix();
+
+        const payload: Partial<Project> = {
+            ...dto,
+            id: this.uuid,
+            createdAt: unix,
+            updatedAt: unix,
+            owner: user,
+            gravatar: this.gravatar(dto.name)
+        };
+
+        const project = await this.manager.getRepository(Project).save(payload);
+        if (!project) {
+            return null;
+        }
+
+        if (username !== ADMIN_NAME) {
+            const admin = await this.userQueryService.getDtoBy({ email: ADMIN_EMAIL });
+            await this.createMember(admin, project, manager);
+        }
+
+        await this.createMember(user, project, manager);
+
+        const dashboard = await this.createDashboard(project, manager);
+        if (!dashboard) {
+            return null;
+        }
+
+        project.mainDashboardId = dashboard.id;
+
+        await manager.getRepository(Project).update({ id: project.id }, {
+            updatedAt: dateUtils.toUnix(),
+            mainDashboardId: dashboard.id
+        });
+
+        return project;
+    }
+
+    private async createDashboard(project: Project, manager = this.manager) {
+        return await this.dashboardService.create({
+            name: "Base Dashboard",
+            description: undefined,
+            isEditable: false,
+            isTimePicker: false,
+            isBase: true
+        },
+            project,
+            manager
+        );
+    }
+
+    private async createMember(user: User, project: Project, manager = this.manager) {
+        await this.memberService.createMember(user, project, MemberRole.ADMINISTRATOR, manager);
+    }
+
+    private get uuid() {
+        return uuidService.generate();
+    }
+
+    private gravatar(name: string) {
+        return gravatar.url(name, "identicon");
+    }
+}

lib/src/api/project/project.module.ts

@@ -9,6 +9,7 @@ import { UserQueryService } from "../user/user-query/user-query.service";
 import { ProjectsController } from "./projects.controller";
 import { DashboardService } from "../dashboard/dashboard.service";
 import { DashboardQueryService } from "../dashboard/dashboard-query/dashboard-query.service";
+import { ProjectFactory } from "./project.factory";
 
 @Module({
   imports: [PassportModule.register({ defaultStrategy: "jwt" })],
@@ -19,7 +20,8 @@ import { DashboardQueryService } from "../dashboard/dashboard-query/dashboard-qu
     MemberQueryService,
     UserQueryService,
     DashboardService,
-    DashboardQueryService
+    DashboardQueryService,
+    ProjectFactory
   ],
   controllers: [ProjectsController, ProjectController],
   exports: [ProjectService, ProjectQueryService]

lib/src/api/project/project.service.ts

@@ -1,37 +1,32 @@
 import { Injectable, Logger } from "@nestjs/common";
-import { MemberService } from "../member/member.service";
 import { EntityManager } from "typeorm";
 import * as crypto from "crypto";
 import { ProjectQueryService } from "./project-query/project-query.service";
 import { UserQueryService } from "../user/user-query/user-query.service";
-import { ADMIN_NAME, ADMIN_EMAIL, INTERNAL_SERVER_ERROR } from "../../common/helpers/constants";
+import { INTERNAL_SERVER_ERROR } from "../../common/helpers/constants";
 import dateUtils from "../../common/helpers/dateUtils";
-import { gravatar } from "../../common/helpers/gravatar";
-import { uuidService } from "../../common/helpers/uuid";
 import { CreateProjectDto, ProjectDto } from "../../common/types/dto/project.dto";
 import { Project } from "../../db/entities/project.entity";
 import { ApiResponse } from "../../common/types/dto/response.dto";
-import { MemberRole, UserStatus } from "@traceo/types";
+import { UserStatus } from "@traceo/types";
 import { RequestContext } from "../../common/middlewares/request-context/request-context.model";
-import { DashboardService } from "../dashboard/dashboard.service";
-import { initialDashboardPanels } from "../dashboard/base.dashboards";
+import { ProjectFactory } from "./project.factory";
 
 @Injectable()
 export class ProjectService {
   private readonly logger: Logger;
 
   constructor(
     private readonly entityManager: EntityManager,
-    private readonly memberService: MemberService,
     private readonly projectQueryService: ProjectQueryService,
     private readonly userQueryService: UserQueryService,
-    private readonly dashboardService: DashboardService
+    private readonly projectFactory: ProjectFactory
   ) {
     this.logger = new Logger(ProjectService.name);
   }
 
   public async create(dto: CreateProjectDto): Promise<ApiResponse<Project>> {
-    const { id, username } = RequestContext.user;
+    const { id } = RequestContext.user;
 
     return this.entityManager
       .transaction(async (manager) => {
@@ -47,46 +42,13 @@ export class ProjectService {
           throw new Error(INTERNAL_SERVER_ERROR);
         }
 
-        const url = gravatar.url(dto.name, "identicon");
-        const payload: Partial<Project> = {
-          ...dto,
-          id: uuidService.generate(),
-          createdAt: dateUtils.toUnix(),
-          updatedAt: dateUtils.toUnix(),
-          owner: user,
-          gravatar: url
-        };
-
-        const project = await manager.getRepository(Project).save(payload);
-        if (username !== ADMIN_NAME) {
-          const admin = await this.userQueryService.getDtoBy({ email: ADMIN_EMAIL });
-          await this.memberService.createMember(
-            admin,
-            project,
-            MemberRole.ADMINISTRATOR,
-            manager
-          );
+        const project = await this.projectFactory.create(user, dto, manager);
+        if (!project) {
+          return new ApiResponse("error", "Error while creating the project. Please try again later.", undefined);
         }
 
-        await this.memberService.createMember(user, project, MemberRole.ADMINISTRATOR, manager);
-
-        // Create basic dashboard
-        const dashboard = await this.dashboardService.create(
-          {
-            name: "Base Dashboard",
-            description: undefined,
-            isEditable: false,
-            isTimePicker: false,
-            isBase: true
-          },
-          project,
-          manager
-        );
-
-        await this.update(project.id, { mainDashboardId: dashboard.id }, manager);
-
         return new ApiResponse("success", "Project successfully created", {
-          redirectUrl: `/project/${project.id}/dashboard/${dashboard.id}`,
+          redirectUrl: `/project/${project.id}/dashboard/${project.mainDashboardId}`,
           id: project.id
         });
       })