feat: show last ticket id

DavidRouyer · Oct 3, 2023 · a5ce5de · a5ce5de
1 parent f8095a9
commit a5ce5de
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 12 deletions.
diff --git a/apps/customer-service/src/components/tickets/ticket-list-item.tsx b/apps/customer-service/src/components/tickets/ticket-list-item.tsx
@@ -1,6 +1,8 @@
 import { FC } from 'react';
 import Link from 'next/link';
 import { usePathname, useSearchParams } from 'next/navigation';
+import { useSession } from 'next-auth/react';
+import { FormattedMessage } from 'react-intl';
 
 import { RouterOutputs } from '@cs/api';
 
@@ -15,6 +17,7 @@ export type TicketListItemProps = {
 export const TicketListItem: FC<TicketListItemProps> = ({ ticket }) => {
   const pathname = usePathname();
   const searchParams = useSearchParams();
+  const session = useSession();
 
   return (
     <section
@@ -46,7 +49,13 @@ export const TicketListItem: FC<TicketListItemProps> = ({ ticket }) => {
             </p>
           </div>
           <p className="mt-1 line-clamp-2 text-sm leading-6 text-muted-foreground">
-            {ticket.content}
+            {session.data?.user?.contactId ===
+            ticket.messages?.[0]?.senderId ? (
+              <>
+                <FormattedMessage id="you" />{' '}
+              </>
+            ) : null}
+            {ticket.messages?.[0]?.content}
           </p>
         </div>
       </Link>

diff --git a/apps/customer-service/src/locales/en.json b/apps/customer-service/src/locales/en.json
@@ -55,5 +55,6 @@
   "try_again": "Try again",
   "user.email": "Email address",
   "user.phone": "Phone",
-  "user.platform": "Platform"
+  "user.platform": "Platform",
+  "you": "You:"
 }
diff --git a/apps/customer-service/src/locales/fr.json b/apps/customer-service/src/locales/fr.json
@@ -56,5 +56,6 @@
   "try_again": "Réessayer",
   "user.email": "Adresse e-mail",
   "user.phone": "Téléphone",
-  "user.platform": "Plateforme"
+  "user.platform": "Plateforme",
+  "you": "Vous :"
 }
diff --git a/packages/api/src/router/ticket.ts b/packages/api/src/router/ticket.ts
@@ -64,7 +64,13 @@ export const ticketRouter = createTRPCRouter({
                 unassigned: isNull(schema.tickets.assignedToId),
               }[input.filter]
         ),
-        with: { author: true },
+        with: {
+          author: true,
+          messages: {
+            orderBy: desc(schema.messages.createdAt),
+            limit: 1,
+          },
+        },
         limit: PAGE_SIZE,
       });
 

diff --git a/packages/database/schema/ticket.ts b/packages/database/schema/ticket.ts
@@ -22,7 +22,6 @@ export const tickets = pgTable('Ticket', {
     .notNull(),
   updatedAt: timestamp('updatedAt', { precision: 3, mode: 'date' }),
   resolvedAt: timestamp('resolvedAt', { precision: 3, mode: 'date' }),
-  content: text('content'),
   status: ticketStatus('status').notNull(),
   assignedToId: integer('assignedToId').references(() => contacts.id, {
     onDelete: 'restrict',

diff --git a/packages/database/seed.ts b/packages/database/seed.ts
@@ -92,7 +92,6 @@ async function main() {
     .insert(schema.tickets)
     .values({
       status: TicketStatus.Open,
-      content: "My order hasn't arrived yet.",
       createdAt: new Date('2023-05-04T20:54:41.389Z'),
       authorId: leslie.id,
       assignedToId: tom.id,
@@ -146,7 +145,6 @@ async function main() {
     .insert(schema.tickets)
     .values({
       status: TicketStatus.Open,
-      content: 'Could not purchase.',
       createdAt: new Date('2023-05-06T11:23:45.389Z'),
       authorId: leslie.id,
     })
@@ -166,7 +164,6 @@ async function main() {
     .insert(schema.tickets)
     .values({
       status: TicketStatus.Resolved,
-      content: "Impossible d'acheter",
       createdAt: new Date('2023-05-06T11:23:45.389Z'),
       resolvedAt: new Date('2023-06-12T06:10:45.389Z'),
       authorId: leslie.id,
@@ -211,7 +208,6 @@ async function main() {
     .insert(schema.tickets)
     .values({
       status: TicketStatus.Open,
-      content: 'I received a damaged product.',
       createdAt: new Date('2023-03-03T14:02Z'),
       authorId: michael.id,
     })
@@ -269,7 +265,6 @@ async function main() {
     .insert(schema.tickets)
     .values({
       status: TicketStatus.Open,
-      content: 'I need to return an item.',
       createdAt: new Date('2023-03-03T13:23Z'),
       authorId: dries.id,
     })
@@ -330,8 +325,6 @@ async function main() {
     .insert(schema.tickets)
     .values({
       status: TicketStatus.Open,
-      content:
-        'Unde dolore exercitationem nobis reprehenderit rerum corporis accusamus. Nemo suscipit temporibus quidem dolorum. Nobis optio quae atque blanditiis aspernatur doloribus sit accusamus. Sunt reiciendis ut corrupti ab debitis dolorem dolorem nam sit. Ducimus nisi qui earum aliquam. Est nam doloribus culpa illum.',
       createdAt: new Date('2023-03-02T21:13Z'),
       authorId: lindsay.id,
     })