Merge pull request #11 from chingu-x/dev

release: voyage team module

Author: Dan-Y-Ko

generate-exports.js

@@ -2,9 +2,13 @@ import fs from "fs";
 import path from "path";
 
 const distPath = "./dist";
+const excludeFolders = ["rest-api"]; // Add the names of folders you want to exclude
 
 const components = fs.readdirSync(distPath).filter((file) => {
-  return fs.statSync(path.join(distPath, file)).isDirectory();
+  return (
+    fs.statSync(path.join(distPath, file)).isDirectory() &&
+    !excludeFolders.includes(file)
+  );
 });
 
 const exportsObject = {
@@ -20,6 +24,10 @@ const exportsObject = {
     import: "./dist/resolver.js",
     types: "./dist/resolver.d.ts",
   },
+  "./config": {
+    import: "./dist/config.js",
+    types: "./dist/config.d.ts",
+  },
 };
 
 components.forEach((component) => {

package.json

@@ -59,21 +59,25 @@
       "import": "./dist/resolver.js",
       "types": "./dist/resolver.d.ts"
     },
+    "./config": {
+      "import": "./dist/config.js",
+      "types": "./dist/config.d.ts"
+    },
     "./auth": {
       "import": "./dist/auth/index.js",
       "types": "./dist/auth/index.d.ts"
     },
-    "./rest-api": {
-      "import": "./dist/rest-api/index.js",
-      "types": "./dist/rest-api/index.d.ts"
-    },
     "./test": {
       "import": "./dist/test/index.js",
       "types": "./dist/test/index.d.ts"
     },
     "./user": {
       "import": "./dist/user/index.js",
       "types": "./dist/user/index.d.ts"
+    },
+    "./voyage-team": {
+      "import": "./dist/voyage-team/index.js",
+      "types": "./dist/voyage-team/index.d.ts"
     }
   },
   "dependencies": {
@@ -84,4 +88,4 @@
     "reflect-metadata": "^0.2.2",
     "tsyringe": "^4.8.0"
   }
-}
+}

src/config.ts

@@ -11,6 +11,10 @@ import { UserApiAdapter } from "./user/adapters/secondary/userApiAdapter";
 import { GetUserUsecase } from "./user/application/usecases/getUserUsecase";
 import { GetChinguMemberStatusUsecase } from "./user/application/usecases/getChinguMemberStatusUsecase";
 import { UserClientAdapter } from "./user/adapters/primary/userClientAdapter";
+import { VoyageTeamClientAdapter } from "./voyage-team/adapters/primary/voyageTeamClientAdapter";
+import { GetCurrentVoyageTeamUsecase } from "./voyage-team/application/usecases/getCurrentVoyageTeamUsecase";
+import { GetCurrentVoyageTeamIdUsecase } from "./voyage-team/application/usecases/getCurrentVoyageTeamIdUsecase";
+import { HasVoyageStartedUsecase } from "./voyage-team/application/usecases/hasVoyageStartedUsecase";
 
 container.register(TYPES.RestApiPort, { useClass: AxiosAdapter });
 container.register(TYPES.AuthApiPort, { useClass: AuthApiAdapter });
@@ -29,17 +33,17 @@ container.register(TYPES.GetChinguMemberStatusUsecase, {
   useClass: GetChinguMemberStatusUsecase,
 });
 container.register(TYPES.UserClientAdapter, { useClass: UserClientAdapter });
-// container.register(TYPES.VoyageTeamClientAdapter, {
-//   useClass: VoyageTeamClientAdapter,
-// });
-// container.register(TYPES.GetCurrentVoyageTeamUsecase, {
-//   useClass: GetCurrentVoyageTeamUsecase,
-// });
-// container.register(TYPES.GetCurrentVoyageTeamIdUsecase, {
-//   useClass: GetCurrentVoyageTeamIdUsecase,
-// });
-// container.register(TYPES.HasVoyageStartedUsecase, {
-//   useClass: HasVoyageStartedUsecase,
-// });
+container.register(TYPES.VoyageTeamClientAdapter, {
+  useClass: VoyageTeamClientAdapter,
+});
+container.register(TYPES.GetCurrentVoyageTeamUsecase, {
+  useClass: GetCurrentVoyageTeamUsecase,
+});
+container.register(TYPES.GetCurrentVoyageTeamIdUsecase, {
+  useClass: GetCurrentVoyageTeamIdUsecase,
+});
+container.register(TYPES.HasVoyageStartedUsecase, {
+  useClass: HasVoyageStartedUsecase,
+});
 
 export default container;

src/types.ts

@@ -12,15 +12,20 @@ import type { UserApiPort } from "./user/ports/secondary/userApiPort";
 import type { UserClientAdapter } from "./user/adapters/primary/userClientAdapter";
 import type { GetUserUsecase } from "./user/application/usecases/getUserUsecase";
 import type { GetChinguMemberStatusUsecase } from "./user/application/usecases/getChinguMemberStatusUsecase";
+import type { VoyageTeamClientPort } from "./voyage-team/ports/primary/voyageTeamClientPort";
+import type { VoyageTeamClientAdapter } from "./voyage-team/adapters/primary/voyageTeamClientAdapter";
+import type { GetCurrentVoyageTeamUsecase } from "./voyage-team/application/usecases/getCurrentVoyageTeamUsecase";
+import type { GetCurrentVoyageTeamIdUsecase } from "./voyage-team/application/usecases/getCurrentVoyageTeamIdUsecase";
+import type { HasVoyageStartedUsecase } from "./voyage-team/application/usecases/hasVoyageStartedUsecase";
 
 export const TYPES = {
   /* Ports */
   RestApiPort: Symbol.for("RestApiPort") as InjectionToken<RestApiPort>,
   AuthApiPort: Symbol.for("AuthApiPort") as InjectionToken<AuthApiPort>,
   UserApiPort: Symbol.for("UserApiPort") as InjectionToken<UserApiPort>,
-  // VoyageTeamClientPort: Symbol.for(
-  //   "VoyageTeamClientPort"
-  // ) as InjectionToken<VoyageTeamClientPort>,
+  VoyageTeamClientPort: Symbol.for(
+    "VoyageTeamClientPort",
+  ) as InjectionToken<VoyageTeamClientPort>,
 
   /* Adapters */
   AuthClientAdapter: Symbol.for(
@@ -29,9 +34,9 @@ export const TYPES = {
   UserClientAdapter: Symbol.for(
     "UserClientAdapter",
   ) as InjectionToken<UserClientAdapter>,
-  // VoyageTeamClientAdapter: Symbol.for(
-  //   "VoyageTeamClientAdapter"
-  // ) as InjectionToken<VoyageTeamClientAdapter>,
+  VoyageTeamClientAdapter: Symbol.for(
+    "VoyageTeamClientAdapter",
+  ) as InjectionToken<VoyageTeamClientAdapter>,
 
   /* UseCases */
   LoginUsecase: Symbol.for("LoginUsecase") as InjectionToken<LoginUsecase>,
@@ -48,13 +53,13 @@ export const TYPES = {
   ResetPasswordUsecase: Symbol.for(
     "ResetPasswordUsecase",
   ) as InjectionToken<ResetPasswordUsecase>,
-  // GetCurrentVoyageTeamUsecase: Symbol.for(
-  //   "GetCurrentVoyageTeamUsecase"
-  // ) as InjectionToken<GetCurrentVoyageTeamUsecase>,
-  // GetCurrentVoyageTeamIdUsecase: Symbol.for(
-  //   "GetCurrentVoyageTeamIdUsecase"
-  // ) as InjectionToken<GetCurrentVoyageTeamIdUsecase>,
-  // HasVoyageStartedUsecase: Symbol.for(
-  //   "HasVoyageStartedUsecase"
-  // ) as InjectionToken<HasVoyageStartedUsecase>,
+  GetCurrentVoyageTeamUsecase: Symbol.for(
+    "GetCurrentVoyageTeamUsecase",
+  ) as InjectionToken<GetCurrentVoyageTeamUsecase>,
+  GetCurrentVoyageTeamIdUsecase: Symbol.for(
+    "GetCurrentVoyageTeamIdUsecase",
+  ) as InjectionToken<GetCurrentVoyageTeamIdUsecase>,
+  HasVoyageStartedUsecase: Symbol.for(
+    "HasVoyageStartedUsecase",
+  ) as InjectionToken<HasVoyageStartedUsecase>,
 };

src/user/application/types/index.ts

@@ -1,4 +1,4 @@
-// import { type VoyageTeamMember } from "@/modules/voyage-team/application/dtos/response.dto";
+import { type VoyageTeamMember } from "@/voyage-team/application/dtos/response.dto";
 
 export interface User {
   id: string;
@@ -20,30 +20,3 @@ export interface User {
 }
 
 type providerType = "discord";
-
-// remove later
-
-export interface VoyageTeamMember {
-  id: number;
-  voyageTeamId: number;
-  voyageTeam: VoyageTeam;
-  voyageRole: VoyageRole;
-}
-
-interface Voyage {
-  status: VoyageStatus;
-}
-
-interface VoyageTeam {
-  name: string;
-  voyage: Voyage;
-  projectSubmitted: boolean;
-}
-
-export interface VoyageRole {
-  name: string;
-}
-
-export interface VoyageStatus {
-  name: string;
-}

src/user/application/usecases/getUserUsecase.ts

@@ -26,7 +26,7 @@ export class GetUserUsecase {
   }
 }
 
-// refactor below code to separate module when ready
+// refactor below code to separate module (sprints) when ready
 
 const currentDate =
   process.env.NODE_ENV === "development"

src/user/index.ts

@@ -5,12 +5,7 @@ export {
   GetUserResponseDto,
   GetChinguMemberStatusResponseDto,
 } from "./application/dtos/response.dto";
-export {
-  User,
-  VoyageTeamMember,
-  VoyageRole,
-  VoyageStatus,
-} from "./application/types/index";
+export { User } from "./application/types/index";
 export { GetChinguMemberStatusUsecase } from "./application/usecases/getChinguMemberStatusUsecase";
 export { GetUserUsecase } from "./application/usecases/getUserUsecase";
 export { UserClientPort } from "./ports/primary/userClientPort";

src/voyage-team/adapters/primary/voyageTeamClientAdapter.ts

@@ -0,0 +1,47 @@
+import { inject, injectable } from "tsyringe";
+import { TYPES } from "@/types";
+import { VoyageTeamClientPort } from "@/voyage-team/ports/primary/voyageTeamClientPort";
+import { GetUserRequestDto } from "@/user/application/dtos/request.dtos";
+import {
+  GetCurrentVoyageTeamIdResponseDto,
+  GetCurrentVoyageTeamResponseDto,
+  HasVoyageStartedResponseDto,
+} from "@/voyage-team/application/dtos/response.dto";
+import { GetCurrentVoyageTeamUsecase } from "@/voyage-team/application/usecases/getCurrentVoyageTeamUsecase";
+import { GetCurrentVoyageTeamIdUsecase } from "@/voyage-team/application/usecases/getCurrentVoyageTeamIdUsecase";
+import { HasVoyageStartedRequestDto } from "@/voyage-team/application/dtos/request.dto";
+import { HasVoyageStartedUsecase } from "@/voyage-team/application/usecases/hasVoyageStartedUsecase";
+
+@injectable()
+export class VoyageTeamClientAdapter implements VoyageTeamClientPort {
+  constructor(
+    @inject(TYPES.GetCurrentVoyageTeamUsecase)
+    private readonly getCurrentVoyageTeamUsecase: GetCurrentVoyageTeamUsecase,
+
+    @inject(TYPES.GetCurrentVoyageTeamIdUsecase)
+    private readonly getCurrentVoyageTeamIdUsecase: GetCurrentVoyageTeamIdUsecase,
+
+    @inject(TYPES.HasVoyageStartedUsecase)
+    private readonly hasVoyageStartedUsecase: HasVoyageStartedUsecase,
+  ) {}
+
+  getCurrentVoyageTeam(
+    user: GetUserRequestDto,
+  ): GetCurrentVoyageTeamResponseDto | undefined {
+    return this.getCurrentVoyageTeamUsecase.execute(user);
+  }
+
+  getCurrentVoyageTeamId(
+    user: GetUserRequestDto,
+  ): GetCurrentVoyageTeamIdResponseDto | undefined {
+    const currentVoyageTeam = this.getCurrentVoyageTeam(user);
+    return this.getCurrentVoyageTeamIdUsecase.execute(currentVoyageTeam);
+  }
+
+  hasVoyageStarted({
+    isAuthenticated,
+    user,
+  }: HasVoyageStartedRequestDto): HasVoyageStartedResponseDto {
+    return this.hasVoyageStartedUsecase.execute({ isAuthenticated, user });
+  }
+}

src/voyage-team/application/dtos/request.dto.ts

@@ -0,0 +1,8 @@
+import { type VoyageTeamMember } from "./response.dto";
+import { type User } from "@/user/application/types";
+
+export type GetCurrentVoyageTeamIdRequestDto = VoyageTeamMember;
+export interface HasVoyageStartedRequestDto {
+  isAuthenticated: boolean;
+  user: User;
+}

src/voyage-team/application/dtos/response.dto.ts

@@ -0,0 +1,28 @@
+export type GetCurrentVoyageTeamResponseDto = VoyageTeamMember;
+export type GetCurrentVoyageTeamIdResponseDto = string | undefined;
+export type HasVoyageStartedResponseDto = boolean;
+
+export interface VoyageTeamMember {
+  id: number;
+  voyageTeamId: number;
+  voyageTeam: VoyageTeam;
+  voyageRole: VoyageRole;
+}
+
+export interface VoyageStatus {
+  name: string;
+}
+
+interface Voyage {
+  status: VoyageStatus;
+}
+
+interface VoyageTeam {
+  name: string;
+  voyage: Voyage;
+  projectSubmitted: boolean;
+}
+
+export interface VoyageRole {
+  name: string;
+}