Merge pull request #83 from vbetsch/develop

Sprint 4 - Relate vaults to users

Author: vbetsch

prisma/migrations/20250807223019_link_vault_to_user/migration.sql

@@ -0,0 +1,14 @@
+/*
+  Warnings:
+
+  - Added the required column `userId` to the `Vault` table without a default value. This is not possible if the table is not empty.
+
+*/
+-- AlterTable
+ALTER TABLE "Vault" ADD COLUMN     "userId" TEXT NOT NULL;
+
+-- CreateIndex
+CREATE INDEX "Vault_userId_idx" ON "Vault"("userId");
+
+-- AddForeignKey
+ALTER TABLE "Vault" ADD CONSTRAINT "Vault_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;

prisma/schema.prisma

@@ -8,15 +8,31 @@ datasource db {
   url      = env("DATABASE_URL")
 }
 
+// --- Business ---
+
+model Vault {
+  uuid      String   @id @default(uuid())
+  label     String   @db.VarChar(255)
+  secret    String
+  createdAt DateTime @default(now())
+  userId    String
+  user      User     @relation(fields: [userId], references: [id], onDelete: Cascade)
+
+  @@index([userId])
+}
+
 // --- Next Auth ---
 
 model User {
-  id        String    @id @default(cuid())
-  name      String?
-  email     String    @unique
-  password  String
-  accounts  Account[]
-  sessions  Session[]
+  id       String    @id @default(cuid())
+  name     String?
+  email    String    @unique
+  password String
+  accounts Account[]
+  sessions Session[]
+
+  // Business
+  vaults   Vault[]
 }
 
 model Account {
@@ -47,16 +63,7 @@ model VerificationToken {
   identifier String
   token      String   @unique
   expires    DateTime
-  @@map("verification_tokens")
-  @@unique([identifier, token])
-}
-
 
-// --- Business ---
-
-model Vault {
-  uuid      String   @id @default(uuid())
-  label     String   @db.VarChar(255)
-  secret    String
-  createdAt DateTime @default(now())
+  @@unique([identifier, token])
+  @@map("verification_tokens")
 }

src/app/api/auth/register/route.ts

@@ -4,10 +4,10 @@ import type { HttpResponseDto } from '@shared/dto/output/responses/abstract/http
 import type { RegisterDataDto } from '@shared/dto/output/data/register.data.dto';
 import type { RegisterPayloadDto } from '@shared/dto/input/payloads/register.payload.dto';
 import { container } from 'tsyringe';
-import { handleApiRequest } from '@api/helpers/api/handle-api-request';
+import { handleApiRequest } from '@api/app/helpers/handle-api-request';
 import { StatusCodes } from 'http-status-codes';
 import type { UserModelDto } from '@shared/dto/models/user.model.dto';
-import { RegisterUseCase } from '@api/usecases/auth/register.usecase';
+import { RegisterUseCase } from '@api/domain/usecases/auth/register.usecase';
 
 /**
  * @swagger

src/app/api/vaults/[id]/route.ts

@@ -1,9 +1,9 @@
 import 'reflect-metadata';
 import type { NextRequest, NextResponse } from 'next/server';
 import { container } from 'tsyringe';
-import { handleApiRequest } from '@api/helpers/api/handle-api-request';
+import { handleApiRequest } from '@api/app/helpers/handle-api-request';
 import { StatusCodes } from 'http-status-codes';
-import { DeleteVaultUseCase } from '@api/usecases/vaults/delete-vault.usecase';
+import { DeleteVaultUseCase } from '@api/domain/usecases/vaults/delete-vault.usecase';
 import type { CreateVaultParams } from '@shared/dto/input/params/create-vault.params';
 import type { HttpOptions } from '@shared/dto/input/options/abstract/http-options';
 

src/app/api/vaults/route.ts

@@ -1,10 +1,10 @@
 import 'reflect-metadata';
 import type { NextRequest, NextResponse } from 'next/server';
 import { container } from 'tsyringe';
-import { handleApiRequest } from '@api/helpers/api/handle-api-request';
+import { handleApiRequest } from '@api/app/helpers/handle-api-request';
 import type { VaultModelDto } from '@shared/dto/models/vault.model.dto';
-import { CreateVaultUseCase } from '@api/usecases/vaults/create-vault.usecase';
-import { GetMyVaultsUseCase } from '@api/usecases/vaults/get-my-vaults.usecase';
+import { CreateVaultUseCase } from '@api/domain/usecases/vaults/create-vault.usecase';
+import { GetMyVaultsUseCase } from '@api/domain/usecases/vaults/get-my-vaults.usecase';
 import { StatusCodes } from 'http-status-codes';
 import type { CreateVaultDataDto } from '@shared/dto/output/data/create-vault.data.dto';
 import type { GetMyVaultsDataDto } from '@shared/dto/output/data/get-my-vaults.data.dto';

src/lib/auth.ts

@@ -4,7 +4,7 @@ import CredentialsProvider from 'next-auth/providers/credentials';
 import { PrismaAdapter } from '@next-auth/prisma-adapter';
 import prisma from '@lib/prisma';
 import { RoutesEnum } from '@ui/router/routes.enum';
-import { SignInUseCase } from '@api/usecases/auth/signin.usecase';
+import { SignInUseCase } from '@api/domain/usecases/auth/signin.usecase';
 import { container } from 'tsyringe';
 import type { UserModelDto } from '@shared/dto/models/user.model.dto';
 import type { SignInPayloadDto } from '@shared/dto/input/payloads/sign-in.payload.dto';

…i/adapters/abstract/adapter.interface.ts …p/adapters/abstract/adapter.interface.tssrc/modules/api/adapters/abstract/adapter.interface.ts renamed to src/modules/api/app/adapters/abstract/adapter.interface.ts src/modules/api/adapters/abstract/adapter.interface.ts renamed to src/modules/api/app/adapters/abstract/adapter.interface.ts

@@ -1,5 +1,5 @@
 import { injectable } from 'tsyringe';
-import { IAdapter } from '@api/adapters/abstract/adapter.interface';
+import { IAdapter } from '@api/app/adapters/abstract/adapter.interface';
 import { User } from '@prisma/generated';
 import { UserModelDto } from '@shared/dto/models/user.model.dto';
 

src/modules/api/adapters/user.adapter.ts …modules/api/app/adapters/user.adapter.tssrc/modules/api/adapters/user.adapter.ts renamed to src/modules/api/app/adapters/user.adapter.ts src/modules/api/adapters/user.adapter.ts renamed to src/modules/api/app/adapters/user.adapter.ts

@@ -1,7 +1,7 @@
 import { injectable } from 'tsyringe';
 import { VaultModelDto } from '@shared/dto/models/vault.model.dto';
 import { Vault } from '@prisma/generated';
-import { IAdapter } from '@api/adapters/abstract/adapter.interface';
+import { IAdapter } from '@api/app/adapters/abstract/adapter.interface';
 
 @injectable()
 export class VaultAdapter implements IAdapter<Vault, VaultModelDto> {