Refactor/hexagonal pattern poc v2

package.json

@@ -33,7 +33,9 @@
     "react-hook-form": "^7.46.2",
     "react-redux": "^8.1.2",
     "redux-persist": "^6.0.0",
+    "reflect-metadata": "^0.2.2",
     "tailwind-merge": "^2.0.0",
+    "tsyringe": "^4.8.0",
     "zod": "^3.22.2"
   },
   "devDependencies": {

src/app/(auth)/authService.ts

@@ -1,7 +1,8 @@
 "use server";
 
 import { cookies } from "next/headers";
-import { type AsyncActionResponse, handleAsync } from "@/utils/handleAsync";
+import { handleAsync } from "@/utils/handleAsync";
+import { type AsyncActionResponse } from "@/utils/handleAsync";
 import { getAccessToken, getRefreshToken } from "@/utils/getCookie";
 import { POST, UNAUTHPOST } from "@/utils/requests";
 

src/app/(main)/dashboard/components/voyage-dashboard/getDashboardData.ts

@@ -2,7 +2,8 @@ import { fetchSprints } from "@/myVoyage/sprints/components/RedirectToCurrentSpr
 import { fetchMeeting } from "@/myVoyage/sprints/components/SprintWrapper";
 import type { User } from "@/store/features/user/userSlice";
 import type { Sprint, Voyage } from "@/store/features/sprint/sprintSlice";
-import type { AppError } from "@/types/types";
+import { type AppError } from "@/types/types";
+import { type AsyncActionResponse } from "@/utils/handleAsync";
 import { getCurrentSprint } from "@/utils/getCurrentSprint";
 import { getCurrentVoyageData } from "@/utils/getCurrentVoyageData";
 import { fetchResources } from "@/app/(main)/my-voyage/[teamId]/voyage-resources/components/ResourcesComponentWrapper";
@@ -13,7 +14,6 @@ import { type FeaturesList } from "@/store/features/features/featuresSlice";
 import { type IdeationData } from "@/store/features/ideation/ideationSlice";
 import { type TechStackData } from "@/store/features/techStack/techStackSlice";
 import { type ResourceData } from "@/store/features/resources/resourcesSlice";
-import type { AsyncActionResponse } from "@/utils/handleAsync";
 import { ErrorType } from "@/utils/error";
 
 interface GetDashboardDataResponse {

src/app/(main)/my-voyage/[teamId]/directory/components/DirectoryComponentWrapper.tsx

@@ -9,7 +9,8 @@ import ErrorComponent from "@/components/Error";
 import { type TeamDirectory } from "@/store/features/directory/directorySlice";
 
 import { getAccessToken } from "@/utils/getCookie";
-import { type AsyncActionResponse, handleAsync } from "@/utils/handleAsync";
+import { handleAsync } from "@/utils/handleAsync";
+import { type AsyncActionResponse } from "@/utils/handleAsync";
 import { GET } from "@/utils/requests";
 import { CacheTag } from "@/utils/cacheTag";
 import { type User } from "@/store/features/user/userSlice";

src/app/(main)/my-voyage/[teamId]/directory/directoryService.ts

@@ -2,7 +2,8 @@
 
 import { revalidateTag } from "next/cache";
 import { getAccessToken } from "@/utils/getCookie";
-import { type AsyncActionResponse, handleAsync } from "@/utils/handleAsync";
+import { handleAsync } from "@/utils/handleAsync";
+import { type AsyncActionResponse } from "@/utils/handleAsync";
 import { PATCH } from "@/utils/requests";
 import { CacheTag } from "@/utils/cacheTag";
 

src/app/(main)/my-voyage/[teamId]/features/components/FeaturesComponentWrapper.tsx

@@ -16,7 +16,8 @@ import { getUser } from "@/utils/getUser";
 import { getAccessToken } from "@/utils/getCookie";
 import { GET } from "@/utils/requests";
 import { CacheTag } from "@/utils/cacheTag";
-import { type AsyncActionResponse, handleAsync } from "@/utils/handleAsync";
+import { handleAsync } from "@/utils/handleAsync";
+import { type AsyncActionResponse } from "@/utils/handleAsync";
 import { ErrorType } from "@/utils/error";
 
 function transformData(features: Features[]): FeaturesList[] {

src/app/(main)/my-voyage/[teamId]/features/featuresService.ts

@@ -4,7 +4,8 @@ import { revalidateTag } from "next/cache";
 import { type Features } from "@/store/features/features/featuresSlice";
 import { CacheTag } from "@/utils/cacheTag";
 import { getAccessToken } from "@/utils/getCookie";
-import { type AsyncActionResponse, handleAsync } from "@/utils/handleAsync";
+import { handleAsync } from "@/utils/handleAsync";
+import { type AsyncActionResponse } from "@/utils/handleAsync";
 import { DELETE, PATCH, POST } from "@/utils/requests";
 
 interface SaveOrderProps {

src/app/(main)/my-voyage/[teamId]/ideation/adapters/ideationClientAdapter.ts

@@ -0,0 +1,34 @@
+import { type IdeationClientPort } from "@/modules/ideation/ports/primary/ideationClientPort";
+import { type AddIdeationResponseDto } from "@/modules/ideation/application/dtos/response.dto";
+import { AddIdeationUseCase } from "@/modules/ideation/application/usecases/addIdeationUseCase";
+import { NextJsRestApiAdapter } from "@/modules/restApi/adapters/secondary/nextJsRestApiAdapter";
+import { IdeationApiAdapter } from "@/modules/ideation/adapters/secondary/ideationApiAdapter";
+import { type AddIdeationRequestDto } from "@/modules/ideation/application/dtos/request.dto";
+
+const nextJsRestApiAdapter = new NextJsRestApiAdapter(
+  process.env.NEXT_PUBLIC_API_URL!,
+);
+const ideationApiPort = new IdeationApiAdapter(nextJsRestApiAdapter);
+
+export class IdeationClientAdapter implements IdeationClientPort {
+  async addIdeation({
+    teamId,
+    title,
+    description,
+    vision,
+    token,
+    cache,
+  }: Required<AddIdeationRequestDto>): Promise<AddIdeationResponseDto> {
+    const addIdeationUseCase = new AddIdeationUseCase(ideationApiPort);
+
+    // refactor this later to not expect a function
+    return await addIdeationUseCase.execute({
+      teamId,
+      title,
+      description,
+      vision,
+      cache,
+      token,
+    });
+  }
+}

src/app/(main)/my-voyage/[teamId]/ideation/ideationService.ts → src/app/(main)/my-voyage/[teamId]/ideation/adapters/ideationSA.ts

@@ -1,10 +1,14 @@
 "use server";
 
 import { revalidateTag } from "next/cache";
+import { IdeationClientAdapter } from "./ideationClientAdapter";
 import { getAccessToken } from "@/utils/getCookie";
 import { DELETE, PATCH, POST } from "@/utils/requests";
-import { type AsyncActionResponse, handleAsync } from "@/utils/handleAsync";
+import { handleAsync } from "@/utils/handleAsync";
+import { type AsyncActionResponse } from "@/utils/handleAsync";
 import { CacheTag } from "@/utils/cacheTag";
+import { type AddIdeationResponseDto } from "@/modules/ideation/application/dtos/response.dto";
+import { type AddIdeationRequestDto } from "@/modules/ideation/application/dtos/request.dto";
 
 interface IdeationProps {
   teamId: number;
@@ -53,21 +57,27 @@ export interface IdeationVoteResponse extends IdeationResponse {
   projectIdeaId: number;
 }
 
+const addIdeationClientAdapter = new IdeationClientAdapter();
+
 export async function addIdeation({
   teamId,
   title,
   description,
   vision,
-}: AddIdeationProps): Promise<AsyncActionResponse<AddIdeationResponse>> {
+}: AddIdeationRequestDto): Promise<
+  AsyncActionResponse<AddIdeationResponseDto>
+> {
   const token = getAccessToken();
 
   const addIdeationAsync = () =>
-    POST<AddIdeationBody, AddIdeationResponse>(
-      `api/v1/voyages/teams/${teamId}/ideations`,
+    addIdeationClientAdapter.addIdeation({
+      teamId,
+      title,
+      description,
+      vision,
       token,
-      "default",
-      { title, description, vision },
-    );
+      cache: "default",
+    });
 
   const [res, error] = await handleAsync(addIdeationAsync);
 

src/app/(main)/my-voyage/[teamId]/ideation/components/IdeationComponentWrapper.tsx

@@ -5,7 +5,7 @@ import FinalizedIdeationCard from "./FinalizedIdeationCard";
 import IdeationContainer from "./IdeationContainer";
 import IdeationProvider from "./IdeationProvider";
 import VoteCard from "./VoteCard";
-import { type FetchIdeationsProps } from "@/app/(main)/my-voyage/[teamId]/ideation/ideationService";
+import { type FetchIdeationsProps } from "@/app/(main)/my-voyage/[teamId]/ideation/adapters/ideationSA";
 import Banner from "@/components/banner/Banner";
 import VoyagePageBannerContainer from "@/components/banner/VoyagePageBannerContainer";
 import ErrorComponent from "@/components/Error";
@@ -15,7 +15,8 @@ import { CacheTag } from "@/utils/cacheTag";
 import { getAccessToken } from "@/utils/getCookie";
 import { getCurrentVoyageData } from "@/utils/getCurrentVoyageData";
 import { getUser } from "@/utils/getUser";
-import { handleAsync, type AsyncActionResponse } from "@/utils/handleAsync";
+import { handleAsync } from "@/utils/handleAsync";
+import { type AsyncActionResponse } from "@/utils/handleAsync";
 import { GET } from "@/utils/requests";
 import routePaths from "@/utils/routePaths";
 import { ErrorType } from "@/utils/error";

src/app/(main)/my-voyage/[teamId]/ideation/components/IdeationForm.tsx

@@ -18,7 +18,7 @@ import {
   type EditIdeationProps,
   addIdeation,
   deleteIdeation,
-} from "@/app/(main)/my-voyage/[teamId]/ideation/ideationService";
+} from "@/app/(main)/my-voyage/[teamId]/ideation/adapters/ideationSA";
 import useServerAction from "@/hooks/useServerAction";
 import { persistor } from "@/store/store";
 import { onOpenModal } from "@/store/features/modal/modalSlice";

src/app/(main)/my-voyage/[teamId]/ideation/components/VoteCard.tsx

@@ -13,7 +13,7 @@ import useServerAction from "@/hooks/useServerAction";
 import {
   addIdeationVote,
   removeIdeationVote,
-} from "@/app/(main)/my-voyage/[teamId]/ideation/ideationService";
+} from "@/app/(main)/my-voyage/[teamId]/ideation/adapters/ideationSA";
 import { onOpenModal } from "@/store/features/modal/modalSlice";
 import AvatarGroup from "@/components/avatar/AvatarGroup";
 import Avatar from "@/components/avatar/Avatar";

src/app/(main)/my-voyage/[teamId]/ideation/finalize/components/ConfirmationButton.tsx

@@ -2,7 +2,7 @@ import { useParams, useRouter } from "next/navigation";
 import { type FinalizedIdeation } from "./FinalizeIdeationList";
 import useServerAction from "@/hooks/useServerAction";
 import Button from "@/components/Button";
-import { finalizeIdeation } from "@/myVoyage/ideation/ideationService";
+import { finalizeIdeation } from "@/myVoyage/ideation/adapters/ideationSA";
 import routePaths from "@/utils/routePaths";
 import { useAppDispatch } from "@/store/hooks";
 import { onOpenModal } from "@/store/features/modal/modalSlice";

src/app/(main)/my-voyage/[teamId]/sprints/components/RedirectToCurrentSprintWrapper.tsx

@@ -16,7 +16,8 @@ import { getUser } from "@/utils/getUser";
 import { getCurrentSprint } from "@/utils/getCurrentSprint";
 import { GET } from "@/utils/requests";
 import { CacheTag } from "@/utils/cacheTag";
-import { type AsyncActionResponse, handleAsync } from "@/utils/handleAsync";
+import { handleAsync } from "@/utils/handleAsync";
+import { type AsyncActionResponse } from "@/utils/handleAsync";
 import { type Sprint } from "@/store/features/sprint/sprintSlice";
 import { getCurrentVoyageData } from "@/utils/getCurrentVoyageData";
 import routePaths from "@/utils/routePaths";

src/app/(main)/my-voyage/[teamId]/sprints/components/SprintWrapper.tsx

@@ -25,7 +25,8 @@ import {
 } from "@/store/features/sprint/sprintSlice";
 
 import { getCurrentSprint } from "@/utils/getCurrentSprint";
-import { type AsyncActionResponse, handleAsync } from "@/utils/handleAsync";
+import { handleAsync } from "@/utils/handleAsync";
+import { type AsyncActionResponse } from "@/utils/handleAsync";
 import { GET } from "@/utils/requests";
 import { getAccessToken } from "@/utils/getCookie";
 import { getUser } from "@/utils/getUser";

src/app/(main)/my-voyage/[teamId]/sprints/components/WeeklyCheckInWrapper.tsx

@@ -9,7 +9,8 @@ import { getAccessToken } from "@/utils/getCookie";
 import { getUser } from "@/utils/getUser";
 import { GET } from "@/utils/requests";
 import { CacheTag } from "@/utils/cacheTag";
-import { type AsyncActionResponse, handleAsync } from "@/utils/handleAsync";
+import { handleAsync } from "@/utils/handleAsync";
+import { type AsyncActionResponse } from "@/utils/handleAsync";
 import { getCurrentVoyageData } from "@/utils/getCurrentVoyageData";
 import routePaths from "@/utils/routePaths";
 import { Forms, UserRole } from "@/utils/form/formsEnums";

src/app/(main)/my-voyage/[teamId]/sprints/sprintsService.ts

@@ -3,7 +3,8 @@
 import { revalidateTag } from "next/cache";
 import { getAccessToken } from "@/utils/getCookie";
 import { DELETE, PATCH, POST } from "@/utils/requests";
-import { type AsyncActionResponse, handleAsync } from "@/utils/handleAsync";
+import { handleAsync } from "@/utils/handleAsync";
+import { type AsyncActionResponse } from "@/utils/handleAsync";
 import { CacheTag } from "@/utils/cacheTag";
 import { getSprintCache } from "@/utils/getSprintCache";
 

src/app/(main)/my-voyage/[teamId]/tech-stack/techStackService.ts

@@ -4,7 +4,8 @@ import { revalidateTag } from "next/cache";
 import type { Category } from "./finalize/types";
 import { CacheTag } from "@/utils/cacheTag";
 import { getAccessToken } from "@/utils/getCookie";
-import { type AsyncActionResponse, handleAsync } from "@/utils/handleAsync";
+import { handleAsync } from "@/utils/handleAsync";
+import { type AsyncActionResponse } from "@/utils/handleAsync";
 import { DELETE, PATCH, POST } from "@/utils/requests";
 import { type TechStackItem } from "@/store/features/techStack/techStackSlice";
 

src/app/(main)/my-voyage/[teamId]/voyage-resources/resourcesService.ts

@@ -3,7 +3,8 @@
 import { revalidateTag } from "next/cache";
 import { getAccessToken } from "@/utils/getCookie";
 import { POST, DELETE } from "@/utils/requests";
-import { type AsyncActionResponse, handleAsync } from "@/utils/handleAsync";
+import { handleAsync } from "@/utils/handleAsync";
+import { type AsyncActionResponse } from "@/utils/handleAsync";
 import { CacheTag } from "@/utils/cacheTag";
 
 interface ResourceProps {

src/app/layout.tsx

@@ -4,6 +4,8 @@ import { Inter } from "next/font/google";
 import StoreProvider from "@/components/providers/StoreProvider";
 import ThemeProvider from "@/components/providers/ThemeProvider";
 import ModalProvider from "@/components/providers/ModalProvider";
+import "reflect-metadata";
+import "@/di/config";
 
 export const metadata: Metadata = {
   title: "Chingu Dashboard",

src/di/config.ts

@@ -0,0 +1,17 @@
+import { container } from "tsyringe";
+
+import { TYPES } from "./types";
+import { type IdeationApiPort } from "@/modules/ideation/ports/secondary/ideationApiPort";
+import { IdeationApiAdapter } from "@/modules/ideation/adapters/secondary/ideationApiAdapter";
+import { type RestApiPort } from "@/modules/restApi/ports/secondary/restApiPort";
+import { NextJsRestApiAdapter } from "@/modules/restApi/adapters/secondary/nextJsRestApiAdapter";
+
+container.register<IdeationApiPort>(TYPES.IdeationApiPort, {
+  useClass: IdeationApiAdapter,
+});
+
+container.register<RestApiPort>(TYPES.RestApiPort, {
+  useValue: new NextJsRestApiAdapter(process.env.NEXT_PUBLIC_API_URL!),
+});
+
+export default container;

src/di/injectables.ts

@@ -0,0 +1,30 @@
+import { container } from "tsyringe";
+import { TYPES } from "./types";
+import type { AddIdeationUseCase } from "@/modules/ideation/application/usecases/addIdeationUseCase";
+import type { AddIdeationVoteUseCase } from "@/modules/ideation/application/usecases/addIdeationVoteUseCase";
+import type { DeleteIdeationUseCase } from "@/modules/ideation/application/usecases/deleteIdeationUseCase";
+import type { EditIdeationUseCase } from "@/modules/ideation/application/usecases/editIdeationUseCase";
+import type { FinalizeIdeationUseCase } from "@/modules/ideation/application/usecases/finalizeIdeationUseCase";
+import type { RemoveIdeationVoteUseCase } from "@/modules/ideation/application/usecases/removeIdeationVoteUseCase";
+
+export const injectables = {
+  /* Ideation */
+  addIdeationUseCase: container.resolve<AddIdeationUseCase>(
+    TYPES.AddIdeationUseCase,
+  ),
+  addIdeationVoteUseCase: container.resolve<AddIdeationVoteUseCase>(
+    TYPES.AddIdeationVoteUseCase,
+  ),
+  deleteIdeationUseCase: container.resolve<DeleteIdeationUseCase>(
+    TYPES.DeleteIdeationUseCase,
+  ),
+  editIdeationUseCase: container.resolve<EditIdeationUseCase>(
+    TYPES.EditIdeationUseCase,
+  ),
+  finalizeIdeationUseCase: container.resolve<FinalizeIdeationUseCase>(
+    TYPES.FinalizeIdeationUseCase,
+  ),
+  removeIdeationVoteUseCase: container.resolve<RemoveIdeationVoteUseCase>(
+    TYPES.RemoveIdeationVoteUseCase,
+  ),
+} as const;

src/di/resolveInjection.ts

@@ -0,0 +1,9 @@
+import "reflect-metadata";
+
+import { injectables } from "./injectables";
+
+const resolveInjection = () => ({
+  ...injectables,
+});
+
+export default resolveInjection;

src/di/resolver.ts

@@ -0,0 +1,10 @@
+import type { InjectionToken } from "tsyringe";
+
+import container from "./config";
+
+export const resolve =
+  <T>(token: InjectionToken<T>) =>
+  // eslint-disable-next-line indent
+  () =>
+    // eslint-disable-next-line indent
+    container.resolve(token);

src/di/types.ts

@@ -0,0 +1,18 @@
+export const TYPES = {
+  /* Ports */
+  RestApiPort: Symbol.for("RestApiPort"),
+  IdeationApiPort: Symbol.for("IdeationApiPort"),
+  IdeationClientPort: Symbol.for("IdeationClientPort"),
+
+  /* Adapters */
+  // NextJsRestApiAdapter: Symbol.for("NextJsRestApiAdapter"),
+  IdeationApiAdapter: Symbol.for("IdeationApiAdapter"),
+
+  /* UseCases */
+  AddIdeationUseCase: Symbol.for("AddIdeationUseCase"),
+  AddIdeationVoteUseCase: Symbol.for("AddIdeationVoteUseCase"),
+  DeleteIdeationUseCase: Symbol.for("DeleteIdeationUseCase"),
+  EditIdeationUseCase: Symbol.for("EditIdeationUseCase"),
+  FinalizeIdeationUseCase: Symbol.for("FinalizeIdeationUseCase"),
+  RemoveIdeationVoteUseCase: Symbol.for("RemoveIdeationVoteUseCase"),
+};

src/hooks/useInjection.ts

@@ -0,0 +1,18 @@
+import "reflect-metadata";
+
+import { useMemo } from "react";
+
+import { injectables } from "@/di/injectables";
+
+const useInjection = () => {
+  const injection = useMemo(
+    () => ({
+      ...injectables,
+    }),
+    [],
+  );
+
+  return injection;
+};
+
+export default useInjection;