Refactoring

apps/api/src/app/activities/activities.controller.ts

@@ -370,7 +370,7 @@ export class ActivitiesController {
         }),
         user: { connect: { id: this.request.user.id } }
       },
-      storedDate: originalActivity.date,
+      originalDate: originalActivity.date,
       userId: this.request.user.id,
       where: {
         id

apps/api/src/app/activities/activities.service.ts

@@ -980,7 +980,7 @@ export class ActivitiesService {
 
   public async updateActivity({
     data,
-    storedDate,
+    originalDate,
     userId,
     where
   }: {
@@ -992,7 +992,7 @@ export class ActivitiesService {
       tags?: { id: string }[];
       type?: ActivityType;
     };
-    storedDate: Date;
+    originalDate: Date;
     userId: string;
     where: Prisma.OrderWhereUniqueInput;
   }): Promise<Order> {
@@ -1049,7 +1049,7 @@ export class ActivitiesService {
 
     if (areTagsProvided) {
       const tagsToSet = getTagsWithDraftTag({
-        storedDate,
+        originalDate,
         tags,
         date: data.date as Date,
         draftTag: { id: TAG_ID_DRAFT },
@@ -1060,7 +1060,7 @@ export class ActivitiesService {
       tagsToUpdate = { set: tagsToSet };
     } else if (
       isDraftTagToBeAssigned({
-        storedDate,
+        originalDate,
         date: data.date as Date,
         type: data.type
       })

apps/api/src/app/portfolio/portfolio.service.ts

@@ -179,7 +179,14 @@ export class PortfolioService {
           activities: {
             include: {
               SymbolProfile: true,
-              tags: { select: { id: true }, where: { id: TAG_ID_DRAFT } }
+              tags: {
+                select: {
+                  id: true
+                },
+                where: {
+                  id: TAG_ID_DRAFT
+                }
+              }
             }
           },
           platform: true,

apps/api/src/helper/activity.helper.ts

@@ -19,18 +19,18 @@ export function getTagsWithDraftTag<T extends { id: string }>({
   date,
   draftTag,
   endOfTodayDate = endOfToday(),
-  storedDate,
+  originalDate,
   tags,
   type
 }: {
   date: Date;
   draftTag: T;
   endOfTodayDate?: Date;
-  storedDate?: Date;
+  originalDate?: Date;
   tags: T[];
   type: ActivityType;
 }) {
-  if (!isDraftTagToBeAssigned({ date, endOfTodayDate, storedDate, type })) {
+  if (!isDraftTagToBeAssigned({ date, endOfTodayDate, originalDate, type })) {
     return tags;
   }
 
@@ -50,12 +50,12 @@ export function isActivityInFuture({
 export function isDraftTagToBeAssigned({
   date,
   endOfTodayDate = endOfToday(),
-  storedDate,
+  originalDate,
   type
 }: {
   date: Date;
   endOfTodayDate?: Date;
-  storedDate?: Date;
+  originalDate?: Date;
   type: ActivityType;
 }) {
   if (NON_INVESTMENT_ACTIVITY_TYPES.includes(type)) {
@@ -68,7 +68,7 @@ export function isDraftTagToBeAssigned({
 
   // Assign only when the date newly moves into the future, so that a tag the
   // user has removed is not restored by an unrelated change
-  return storedDate
+  return originalDate
-    ? !isActivityInFuture({ endOfTodayDate, date: storedDate })
+    ? !isActivityInFuture({ endOfTodayDate, date: originalDate })
     : true;
 }