Merge pull request #17 from asepindrak/dev

Dev

Author: asepindrak

.changeset/shiny-dingos-count.md

@@ -0,0 +1,5 @@
+---
+"commitflow": patch
+---
+
+fix: invite team member

.env.sample

@@ -23,6 +23,7 @@ DATABASE_URL=postgresql://postgres:password@db:5432/commitflow
 BE_PORT=8000
 OPENAI_API_KEY=
 BASE_URL=http://localhost:8000
+FE_URL=http://localhost:3000
 API_KEY=""
 JWT_SECRET=""
 

backend/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "commitflow-api",
-  "version": "1.1.4",
+  "version": "1.1.6",
   "description": "Backend CommitFlow",
   "author": "asepindrak",
   "private": false,

backend/package.json

@@ -139,6 +139,16 @@ model Comment {
   updatedAt   DateTime?
 }
 
+model Invite {
+  id            String    @id @default(uuid())
+  workspaceId   String
+  email         String
+  invitedBy     String
+  isInvited     Boolean   @default(false)
+  createdAt     DateTime  @default(now())
+  updatedAt     DateTime?
+}
+
 enum Role {
   USER
   ADMIN

backend/prisma/schema.prisma

@@ -3,6 +3,6 @@ import { Injectable } from "@nestjs/common";
 @Injectable()
 export class AppService {
   getHello(): string {
-    return `CommitFlow API (1.1.2) is running!`;
+    return `CommitFlow API (1.1.6) is running!`;
   }
 }

backend/src/app.service.ts

@@ -57,3 +57,11 @@ export class UpdateTeamMemberDto {
   @IsString()
   photo?: string;
 }
+
+export class InviteTeamMemberDto {
+  @IsString()
+  email: string;
+
+  @IsString()
+  workspaceId: string;
+}

backend/src/project-management/dto/team.dto.ts

@@ -23,7 +23,11 @@ import { ProjectManagementService } from "./project-management.service";
 import { CreateProjectDto, UpdateProjectDto } from "./dto/project.dto";
 import { CreateTaskDto, UpdateTaskDto, PatchTaskDto } from "./dto/task.dto";
 import { CreateCommentDto, UpdateCommentDto } from "./dto/comment.dto";
-import { CreateTeamMemberDto, UpdateTeamMemberDto } from "./dto/team.dto";
+import {
+  CreateTeamMemberDto,
+  InviteTeamMemberDto,
+  UpdateTeamMemberDto,
+} from "./dto/team.dto";
 import { Request } from "express";
 import * as fs from "fs";
 import { join } from "path";
@@ -191,6 +195,17 @@ export class ProjectManagementController {
     return this.svc.deleteTeamMember(id);
   }
 
+  @Post("team/invite")
+  inviteTeamMember(@Body() dto: InviteTeamMemberDto, @Req() req: any) {
+    const userId = req.user.userId;
+    return this.svc.inviteTeamMember(dto, userId);
+  }
+
+  @Get("team/invite/:id")
+  acceptInvite(@Param("id") id: string) {
+    return this.svc.acceptInvite(id);
+  }
+
   // Simple uploads route (used by frontend if needed)
   @Post("upload")
   @UseInterceptors(FileInterceptor("file"))