Merge pull request #228 from sinamics/cascade_user_deletion

Cascading Deletion for Organization-Related Tables on User Removal
sinamics · Dec 4, 2023 · 205b604 · 205b604
2 parents 31f5e17 + 896e28a
commit 205b604
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 6 deletions.
diff --git a/prisma/migrations/20231204162528_cascade_delete_user/migration.sql b/prisma/migrations/20231204162528_cascade_delete_user/migration.sql
@@ -0,0 +1,29 @@
+-- DropForeignKey
+ALTER TABLE "ActivityLog" DROP CONSTRAINT "ActivityLog_performedById_fkey";
+
+-- DropForeignKey
+ALTER TABLE "LastReadMessage" DROP CONSTRAINT "LastReadMessage_userId_fkey";
+
+-- DropForeignKey
+ALTER TABLE "MembershipRequest" DROP CONSTRAINT "MembershipRequest_userId_fkey";
+
+-- DropForeignKey
+ALTER TABLE "Messages" DROP CONSTRAINT "Messages_userId_fkey";
+
+-- DropForeignKey
+ALTER TABLE "UserOrganizationRole" DROP CONSTRAINT "UserOrganizationRole_userId_fkey";
+
+-- AddForeignKey
+ALTER TABLE "UserOrganizationRole" ADD CONSTRAINT "UserOrganizationRole_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "Messages" ADD CONSTRAINT "Messages_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "LastReadMessage" ADD CONSTRAINT "LastReadMessage_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "MembershipRequest" ADD CONSTRAINT "MembershipRequest_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "ActivityLog" ADD CONSTRAINT "ActivityLog_performedById_fkey" FOREIGN KEY ("performedById") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
@@ -282,7 +282,7 @@ model UserOrganizationRole {
   userId         String
   organizationId String
   role           Role
-  user           User             @relation(fields: [userId], references: [id])
+  user           User             @relation(fields: [userId], references: [id], onDelete: Cascade)
   organization   Organization     @relation(fields: [organizationId], references: [id], onDelete: Cascade)
 
   @@id([userId, organizationId])
@@ -293,7 +293,7 @@ model Messages {
   content         String
   createdAt       DateTime     @default(now())
   userId          String       // Reference to the User model
-  user            User         @relation(fields: [userId], references: [id])
+  user            User         @relation(fields: [userId], references: [id], onDelete: Cascade)
   organizationId  String       // Reference to the Organization model
   organization    Organization @relation(fields: [organizationId], references: [id], onDelete: Cascade)
   lastReadByUsers LastReadMessage[]
@@ -306,7 +306,7 @@ model LastReadMessage {
   organizationId  String
 
   lastMessage     Messages     @relation(fields: [lastMessageId], references: [id])
-  user            User         @relation(fields: [userId], references: [id])
+  user            User         @relation(fields: [userId], references: [id], onDelete: Cascade)
   organization    Organization @relation(fields: [organizationId], references: [id], onDelete: Cascade)
 
   @@unique([userId, organizationId])
@@ -331,7 +331,7 @@ model MembershipRequest {
   id             Int                            @id @default(autoincrement())
   userId         String
   organizationId String
-  user           User                           @relation(fields: [userId], references: [id], name: "MembershipRequestsForUser")
+  user           User                           @relation(fields: [userId], references: [id], name: "MembershipRequestsForUser", onDelete: Cascade)
   organization   Organization                   @relation(fields: [organizationId], references: [id], name: "MembershipRequestsForOrganization", onDelete: Cascade)
 }
 
@@ -340,7 +340,7 @@ model ActivityLog {
   action          String      
   createdAt       DateTime    @default(now())
   performedById   String      
-  performedBy     User        @relation(fields: [performedById], references: [id])
+  performedBy     User        @relation(fields: [performedById], references: [id], onDelete: Cascade)
   organizationId  String?     // Make this optional
   organization    Organization? @relation(fields: [organizationId], references: [id], onDelete: Cascade)
 }

diff --git a/src/components/adminPage/organization/organizationInviteModal.tsx b/src/components/adminPage/organization/organizationInviteModal.tsx
@@ -21,8 +21,10 @@ const OrganizationInviteModal = ({ organizationId }: Iprops) => {
 	});
 
 	const { closeModal } = useModalStore((state) => state);
+	const { refetch: refecthOrgUsers } = api.org.getOrgUsers.useQuery({
+		organizationId,
+	});
 	const { data: allUsers } = api.admin.getUsers.useQuery({ isAdmin: false });
-	// const { refetch: refetchOrganization } = api.org.getAllOrg.useQuery();
 
 	const { mutate: addUser } = api.org.addUser.useMutation();
 
@@ -90,6 +92,7 @@ const OrganizationInviteModal = ({ organizationId }: Iprops) => {
 								{
 									onSuccess: () => {
 										toast.success("User added successfully");
+										refecthOrgUsers();
 										closeModal();
 									},
 								},

diff --git a/src/components/organization/editUserModal.tsx b/src/components/organization/editUserModal.tsx
@@ -20,6 +20,9 @@ const EditOrganizationUserModal = ({ user, organizationId }: Iprops) => {
 	const [input, setInput] = useState({ name: "" });
 	const { closeModal } = useModalStore((state) => state);
 
+	const { refetch: refecthOrgUsers } = api.org.getOrgUsers.useQuery({
+		organizationId,
+	});
 	const { refetch: refecthOrg } = api.org.getOrgById.useQuery({
 		organizationId,
 	});
@@ -39,6 +42,7 @@ const EditOrganizationUserModal = ({ user, organizationId }: Iprops) => {
 		},
 		onSuccess: () => {
 			refecthOrg();
+			refecthOrgUsers();
 			closeModal();
 			toast.success(t("users.users.userOptionModal.toast.deleteUserSuccess"));
 		},