Add property name

dv297 · Oct 21, 2022 · ceb8812 · ceb8812 · vercel · Oct 21, 2022
1 parent 73d1502
commit ceb8812
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 20 deletions.
diff --git a/prisma/migrations/20221021175545_add_property_name/migration.sql b/prisma/migrations/20221021175545_add_property_name/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "IssueAuditEntry" ADD COLUMN     "propertyName" TEXT;
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
@@ -210,17 +210,18 @@ model ActiveSprint {
 }
 
 model IssueAuditEntry {
-  id        String              @id @unique @default(cuid())
-  issue     Issue               @relation(fields: [issueId], references: [id])
-  user      User                @relation(fields: [userId], references: [id])
-  oldValue  String?
-  newValue  String?
-  updatedAt DateTime            @default(now()) @updatedAt
-  createdAt DateTime            @default(now())
-  type      IssueAuditEntryType
-  wasEdited Boolean?            @default(false)
-  issueId   String
-  userId    String
+  id           String              @id @unique @default(cuid())
+  issue        Issue               @relation(fields: [issueId], references: [id])
+  user         User                @relation(fields: [userId], references: [id])
+  propertyName String?
+  oldValue     String?
+  newValue     String?
+  updatedAt    DateTime            @default(now()) @updatedAt
+  createdAt    DateTime            @default(now())
+  type         IssueAuditEntryType
+  wasEdited    Boolean?            @default(false)
+  issueId      String
+  userId       String
 }
 
 enum IssueRelationType {

diff --git a/src/components/pages/issue/IssueAuditEntryListingFactory.tsx b/src/components/pages/issue/IssueAuditEntryListingFactory.tsx
@@ -61,6 +61,7 @@ const HistoryListing = (props: IssueAuditEntryListingProps) => {
   const { issueAuditEntry } = props;
   const { user } = issueAuditEntry;
 
+  console.log(issueAuditEntry.propertyName);
   return (
     <>
       <div className="relative">
@@ -85,7 +86,11 @@ const HistoryListing = (props: IssueAuditEntryListingProps) => {
         </div>
         <div className="mt-2 text-sm text-gray-700 dark:text-gray-100">
           <p>
-            Changed value from <i>&quot;{issueAuditEntry.oldValue}&quot;</i> to{' '}
+            Changed{' '}
+            {issueAuditEntry.propertyName
+              ? `"${issueAuditEntry.propertyName}"`
+              : ''}{' '}
+            value from <i>&quot;{issueAuditEntry.oldValue}&quot;</i> to{' '}
             <i>&quot;{issueAuditEntry.newValue}&quot;</i>
           </p>
         </div>

diff --git a/src/repos/IssueAuditEntryRepo.ts b/src/repos/IssueAuditEntryRepo.ts
@@ -19,29 +19,32 @@ interface IssueAuditEntryOptions {
 }
 
 interface PropertyChange {
+  propertyName: string;
   oldValue: string;
   newValue: string;
 }
 
-function getStatusChangeValues(properties: PropertyChange): PropertyChange {
-  const convertCasing = (s: string) => s.split('_').join(' ');
-  return {
-    oldValue: convertCasing(properties.oldValue),
-    newValue: convertCasing(properties.newValue),
-  };
-}
-
 function getGenericSanitizedPropertyChange(properties: PropertyChange) {
   // Property has already been converted to string, so these values may pop up.
   const sanitize = (s: string | null | undefined) =>
     s === 'null' || s === 'undefined' || !s ? '' : s;
 
   return {
+    ...properties,
     oldValue: sanitize(properties.oldValue),
     newValue: sanitize(properties.newValue),
   };
 }
 
+function getStatusChangeValues(properties: PropertyChange): PropertyChange {
+  const convertCasing = (s: string) => s.split('_').join(' ');
+  return {
+    propertyName: 'Issue Status',
+    oldValue: convertCasing(properties.oldValue),
+    newValue: convertCasing(properties.newValue),
+  };
+}
+
 async function getSprintChangeValues(
   properties: PropertyChange
 ): Promise<PropertyChange> {
@@ -64,6 +67,7 @@ async function getSprintChangeValues(
     sanitize(properties.newValue),
   ]);
   return {
+    propertyName: 'Sprint',
     oldValue,
     newValue,
   };
@@ -91,6 +95,7 @@ async function getAssigneeChangeValues(
     sanitize(properties.newValue),
   ]);
   return {
+    propertyName: 'Assignee',
     oldValue,
     newValue,
   };
@@ -182,6 +187,7 @@ const IssueAuditEntryRepo = {
     newValue: string;
   }) {
     const propertyChange = await getPropertyChange(propertyName, {
+      propertyName,
       oldValue,
       newValue,
     });

diff --git a/src/schemas/IssueSchema.ts b/src/schemas/IssueSchema.ts
@@ -86,6 +86,7 @@ export const IssueAuditEntryType = z
 
 export const IssueAuditEntrySchema = z.object({
   id: z.string(),
+  propertyName: z.string().nullish(),
   oldValue: z.string().nullable(),
   newValue: z.string().nullable(),
   updatedAt: dateSchema,
@@ -109,6 +110,7 @@ export const GetIssueAuditEntriesResponseSchema = z.object({
 
 export const IssueAuditEntryCreateBodySchema = z.object({
   type: z.literal('COMMENT').or(z.literal('CHANGE')),
+  propertyName: z.string().nullish(),
   oldValue: z.string().nullable(),
   newValue: z.string(),
 });
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		-- AlterTable
		ALTER TABLE "IssueAuditEntry" ADD COLUMN "propertyName" TEXT;