From 6c7ce6b404f86d83533f28d3c564cda1e3b8a102 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Buget?= <jbuget@gmail.com>
Date: Mon, 11 Sep 2023 23:22:06 +0200
Subject: [PATCH] Add thread deletion

---
 app.vue                                       |  2 +-
 components/ThreadEditor.vue                   | 29 ++++++++++++++++---
 docker-compose.yml                            |  9 ------
 .../20230906200241_init/migration.sql         |  2 +-
 prisma/schema.prisma                          |  2 +-
 server/api/threads/[id].delete.ts             | 15 ++++++++++
 .../api/threads/{[id]/get.ts => [id].get.ts}  |  6 ++--
 .../threads/{[id]/post.ts => [id].post.ts}    |  6 ++--
 server/api/threads/[id]/delete.ts             |  7 -----
 server/api/threads/[id]/publication.post.ts   |  6 ++--
 utils/utils.ts                                |  9 ++++--
 11 files changed, 59 insertions(+), 34 deletions(-)
 create mode 100644 server/api/threads/[id].delete.ts
 rename server/api/threads/{[id]/get.ts => [id].get.ts} (76%)
 rename server/api/threads/{[id]/post.ts => [id].post.ts} (91%)
 delete mode 100644 server/api/threads/[id]/delete.ts

diff --git a/app.vue b/app.vue
index c23a854..7573f99 100644
--- a/app.vue
+++ b/app.vue
@@ -36,7 +36,7 @@ function newThread() {
 
       <div class="layout-content-wrapper">
         <div class="layout-content-main">
-          <ThreadEditor :threadId="threadId" @threadSaved="refreshThreadList" />
+          <ThreadEditor :threadId="threadId" @threadSaved="refreshThreadList" @threadDeleted="refreshThreadList"/>
         </div>
       </div>
     </div>
diff --git a/components/ThreadEditor.vue b/components/ThreadEditor.vue
index 7db0478..f5d0aa2 100644
--- a/components/ThreadEditor.vue
+++ b/components/ThreadEditor.vue
@@ -12,14 +12,14 @@ const props = defineProps<{
   threadId: number | null
 }>()
 
-const emit = defineEmits(['thread-saved'])
+const emit = defineEmits(['thread-saved', 'thread-deleted'])
 
 const { data: thread, pending } = await useAsyncData(
   'thread',
   async () => {
     let thread: Thread
     if (props.threadId) {
-      const threadData = await $fetch(`/api/threads/${props.threadId}`, {})
+      const threadData:any = await $fetch(`/api/threads/${props.threadId}`)
       thread = {
         id: threadData.id,
         messages: threadData.latest.data.messages.map((message: any) => {
@@ -79,9 +79,11 @@ async function doSaveThread(thread: Thread): Promise<number> {
   }
   const response: any = await $fetch(url, { method: 'post', body: { messages: thread.messages } })
   emit('thread-saved')
+  updateKey.value = generateUniqueKey('message-list')
   return response.id as number
 }
 
+
 async function saveThread(): Promise<void> {
   if (thread.value && thread.value.messages) {
     thread.value.id = await doSaveThread(thread.value)
@@ -98,6 +100,22 @@ async function publishThread(): Promise<void> {
   }
 }
 
+async function deleteThread(): Promise<void> {
+  if (thread.value && thread.value.id) {
+    const url = `/api/threads/${thread.value.id}`
+    await $fetch(url, { method: 'delete' })
+    emit('thread-deleted')
+    toast.add({ severity: 'success', summary: 'Thread deleted', detail: `Removed thread ${thread.value.id} and its messages`, life: 3000 });
+  }
+  thread.value = {
+    messages: [{
+      text: '',
+      attachments: []
+    }]
+  }
+  updateKey.value = generateUniqueKey('message-list')
+}
+
 </script>
 
 <template>
@@ -114,11 +132,14 @@ async function publishThread(): Promise<void> {
           <div class="publish">
             <Button label="Publish" icon="pi pi-send" severity="success" size="small" @click="publishThread" />
           </div>
+          <div class="delete">
+            <Button label="Delete" icon="pi pi-trash" severity="danger" size="small" @click="deleteThread" />
+          </div>
         </div>
       </div>
 
-      <div class="messages">
-        <template v-for="(message, index) in thread.messages" :key="updateKey">
+      <div class="messages" :key="updateKey">
+        <template v-for="(message, index) in thread.messages" >
           <div class="message-wrapper">
             <MessageEditor :index="index" :message="message" @addMessageBelow="addMessageBelow(index + 1)"
               @removeMessage="removeMessage(index)" />
diff --git a/docker-compose.yml b/docker-compose.yml
index 7af310a..d3fcb52 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,15 +1,6 @@
 version: "3"
 
 services:
-  threadr-app:
-    build:
-      context: .
-    ports:
-      - "3000:3000"
-    env_file:
-      - .env
-    depends_on:
-      - minio
 
   minio:
     image: minio/minio
diff --git a/prisma/migrations/20230906200241_init/migration.sql b/prisma/migrations/20230906200241_init/migration.sql
index c28bc97..844869f 100644
--- a/prisma/migrations/20230906200241_init/migration.sql
+++ b/prisma/migrations/20230906200241_init/migration.sql
@@ -19,4 +19,4 @@ CREATE TABLE "Version" (
 );
 
 -- AddForeignKey
-ALTER TABLE "Version" ADD CONSTRAINT "Version_threadId_fkey" FOREIGN KEY ("threadId") REFERENCES "Thread"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE "Version" ADD CONSTRAINT "Version_threadId_fkey" FOREIGN KEY ("threadId") REFERENCES "Thread"("id") ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 88ed777..09b2d13 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -22,6 +22,6 @@ model Version {
   id          Int          @id @default(autoincrement())
   createdAt   DateTime     @default(now())
   data        Json
-  thread      Thread       @relation(fields: [threadId], references: [id])
+  thread      Thread       @relation(fields: [threadId], references: [id], onDelete: Cascade)
   threadId    Int
 }
diff --git a/server/api/threads/[id].delete.ts b/server/api/threads/[id].delete.ts
new file mode 100644
index 0000000..2404bd1
--- /dev/null
+++ b/server/api/threads/[id].delete.ts
@@ -0,0 +1,15 @@
+import { prisma } from '../../../prisma/db'
+
+export default defineEventHandler(async (event: any) => {
+    const threadId = parseInt(event.context.params.id) as number
+    
+    console.log(`DELETE /api/threads/${threadId}`)
+
+    await prisma.thread.delete({
+        where: {
+            id: threadId,
+        },
+    })
+
+    return {}
+})
\ No newline at end of file
diff --git a/server/api/threads/[id]/get.ts b/server/api/threads/[id].get.ts
similarity index 76%
rename from server/api/threads/[id]/get.ts
rename to server/api/threads/[id].get.ts
index 8f353f3..02400d2 100644
--- a/server/api/threads/[id]/get.ts
+++ b/server/api/threads/[id].get.ts
@@ -1,7 +1,7 @@
-import { prisma } from '../../../../prisma/db'
+import { prisma } from '../../../prisma/db'
 
 export default defineEventHandler(async (event: any) => {
-    const threadId = parseInt(getRouterParam(event, 'id') || '')
+    const threadId = parseInt(event.context.params.id) as number
 
     console.log(`GET /api/threads/${threadId}`)
 
@@ -18,6 +18,6 @@ export default defineEventHandler(async (event: any) => {
         const [latest] = thread.versions.slice(-1)
         result.latest = latest
     }
-    //    console.log(result)
+    console.log(result)
     return result;
 })
\ No newline at end of file
diff --git a/server/api/threads/[id]/post.ts b/server/api/threads/[id].post.ts
similarity index 91%
rename from server/api/threads/[id]/post.ts
rename to server/api/threads/[id].post.ts
index 943a7d9..4c9dc9d 100644
--- a/server/api/threads/[id]/post.ts
+++ b/server/api/threads/[id].post.ts
@@ -1,4 +1,4 @@
-import { prisma } from '../../../../prisma/db'
+import { prisma } from '../../../prisma/db'
 
 type UpdateThreadRequest = {
     published: boolean
@@ -14,8 +14,8 @@ type UpdateThreadRequest = {
 }
 
 export default defineEventHandler(async (event: any) => {
-    const threadId = parseInt(getRouterParam(event, 'id') || '')
-
+    const threadId = parseInt(event.context.params.id) as number
+    
     console.log(`POST /api/threads/${threadId}`)
 
     const threadData: UpdateThreadRequest = await readBody(event)
diff --git a/server/api/threads/[id]/delete.ts b/server/api/threads/[id]/delete.ts
deleted file mode 100644
index 97c7740..0000000
--- a/server/api/threads/[id]/delete.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export default defineEventHandler(async (event: any) => {
-    const threadId = parseInt(getRouterParam(event, 'id') || '')
-
-    console.log(`DELETE /api/threads/${threadId}`)
-
-    return 'ok'
-})
\ No newline at end of file
diff --git a/server/api/threads/[id]/publication.post.ts b/server/api/threads/[id]/publication.post.ts
index 71a07d0..07b6194 100644
--- a/server/api/threads/[id]/publication.post.ts
+++ b/server/api/threads/[id]/publication.post.ts
@@ -1,7 +1,9 @@
+import { prisma } from '../../../../prisma/db'
+
 export default defineEventHandler(async (event: any) => {
-    const threadId = parseInt(getRouterParam(event, 'id') || '')
+    const id = parseInt(event.context.params.id) as number
 
-    console.log(`POST /api/threads/${threadId}/publication`)
+    console.log(`POST /api/threads/${id}/publication`)
 
     return 'ok'
 })
\ No newline at end of file
diff --git a/utils/utils.ts b/utils/utils.ts
index 579be1e..bb641a2 100644
--- a/utils/utils.ts
+++ b/utils/utils.ts
@@ -1,4 +1,7 @@
 export function generateUniqueKey(prefix: string, suffix?: string | number) {
-    return `${prefix}_${Date.now()}_${suffix}`
-  }
-  
\ No newline at end of file
+  return `${prefix}_${Date.now()}_${generateRandomString()}`
+}
+
+export function generateRandomString() {
+  return Math.random().toString(36).slice(2, 7);
+}
\ No newline at end of file