Merge pull request #13 from asepindrak/dev

Dev

Author: asepindrak

.changeset/goofy-snakes-report.md

@@ -0,0 +1,5 @@
+---
+"commitflow": patch
+---
+
+member isAdmin & fix drag n drop task

backend/prisma/schema.prisma

@@ -73,6 +73,7 @@ model TeamMember {
   photo       String?
   phone       String?
   isTrash     Boolean  @default(false)
+  isAdmin     Boolean  @default(false)
   createdAt   DateTime @default(now())
   updatedAt   DateTime?
   Task        Task[]

backend/src/auth/auth.service.ts

@@ -93,6 +93,7 @@ export class AuthService {
             email,
             role: role ?? null,
             photo: photo ?? null,
+            isAdmin: true,
             // optionally store clientTempId if you want mapping
             // clientTempId: clientTempId ?? null  // uncomment if you added field
             createdAt: new Date(),

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

@@ -1,4 +1,4 @@
-import { IsOptional, IsString } from "class-validator";
+import { IsBoolean, IsOptional, IsString } from "class-validator";
 
 export class CreateTeamMemberDto {
   @IsString()
@@ -12,6 +12,10 @@ export class CreateTeamMemberDto {
   @IsString()
   email?: string;
 
+  @IsOptional()
+  @IsBoolean()
+  isAdmin?: boolean;
+
   @IsOptional()
   @IsString()
   password?: string;
@@ -37,6 +41,10 @@ export class UpdateTeamMemberDto {
   @IsString()
   role?: string;
 
+  @IsOptional()
+  @IsBoolean()
+  isAdmin?: boolean;
+
   @IsOptional()
   @IsString()
   password?: string;

backend/src/project-management/project-management.service.ts

@@ -717,13 +717,23 @@ export class ProjectManagementService {
       email?: string;
       photo?: string;
       phone?: string;
+      isAdmin?: boolean;
       password?: string;
       clientId?: string | null;
       workspaceId: string;
     }>
   ) {
-    const { clientId, email, name, role, photo, phone, password, workspaceId } =
-      payload as any;
+    const {
+      clientId,
+      email,
+      name,
+      role,
+      photo,
+      phone,
+      isAdmin,
+      password,
+      workspaceId,
+    } = payload as any;
 
     // 1) If clientId provided — try to find existing TeamMember by clientId first.
     if (clientId) {
@@ -770,6 +780,7 @@ export class ProjectManagementService {
             photo: user.photo ? user.photo : photo ?? null,
             phone: phone ?? null,
             clientId: clientId ?? null,
+            isAdmin: isAdmin ?? false,
             userId: user.id,
             workspaceId,
             createdAt: new Date(),
@@ -800,9 +811,11 @@ export class ProjectManagementService {
       role?: string;
       phone?: string;
       password?: string;
+      isAdmin?: boolean;
       photo?: string;
     }>
   ) {
+    console.log(payload);
     // 1) ensure team member exists
     const exists = await prisma.teamMember.findUnique({ where: { id } });
     if (!exists) throw new NotFoundException("Team member not found");
@@ -813,6 +826,8 @@ export class ProjectManagementService {
     if (typeof payload.role !== "undefined") tmData.role = payload.role;
     if (typeof payload.phone !== "undefined") tmData.phone = payload.phone;
     if (typeof payload.photo !== "undefined") tmData.photo = payload.photo;
+    if (typeof payload.isAdmin !== "undefined")
+      tmData.isAdmin = payload.isAdmin;
     tmData.updatedAt = new Date();
 
     // prepare user update/create data

frontend/package.json

@@ -4,7 +4,7 @@
   "author": "asepindrak",
   "private": false,
   "license": "MIT",
-  "version": "1.1.2",
+  "version": "1.3.1",
   "type": "module",
   "scripts": {
     "dev": "vite --host 0.0.0.0",