fix: don't clean up settings when optional data is not present

Unleash · Oct 23, 2023 · dbd8a74 · dbd8a74
1 parent ba53d39
commit dbd8a74
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 13 deletions.
diff --git a/src/lib/db/project-store.ts b/src/lib/db/project-store.ts
@@ -6,6 +6,7 @@ import {
     IEnvironment,
     IFlagResolver,
     IProject,
+    IProjectUpdate,
     IProjectWithCount,
     ProjectMode,
 } from '../types';
@@ -259,25 +260,32 @@ class ProjectStore implements IProjectStore {
         return present;
     }
 
-    // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
-    async update(data): Promise<void> {
+    async update(data: IProjectUpdate): Promise<void> {
         try {
             await this.db(TABLE)
                 .where({ id: data.id })
                 .update(this.fieldToRow(data));
-            if (await this.hasProjectSettings(data.id)) {
-                await this.db(SETTINGS_TABLE)
-                    .where({ project: data.id })
-                    .update({
+            if (
+                data.defaultStickiness !== undefined ||
+                data.featureLimit !== undefined
+            ) {
+                if (await this.hasProjectSettings(data.id)) {
+                    await this.db(SETTINGS_TABLE)
+                        .where({ project: data.id })
+                        .update({
+                            default_stickiness: data.defaultStickiness,
+                            feature_limit: data.featureLimit,
+                        });
+                } else {
+                    // What happens with project mode in this case?
+                    await this.db(SETTINGS_TABLE).insert({
+                        project: data.id,
                         default_stickiness: data.defaultStickiness,
                         feature_limit: data.featureLimit,
                     });
+                }
             } else {
-                await this.db(SETTINGS_TABLE).insert({
-                    project: data.id,
-                    default_stickiness: data.defaultStickiness,
-                    feature_limit: data.featureLimit,
-                });
+                this.logger.warn('NOT UPDATING PROJECT SETTINGS');
             }
         } catch (err) {
             this.logger.error('Could not update project, error: ', err);

diff --git a/src/lib/services/project-service.ts b/src/lib/services/project-service.ts
@@ -39,6 +39,7 @@ import {
     ProjectAccessUserRolesDeleted,
     IFeatureNaming,
     CreateProject,
+    IProjectUpdate,
 } from '../types';
 import {
     IProjectQuery,
@@ -259,16 +260,22 @@ export default class ProjectService {
         return data;
     }
 
-    async updateProject(updatedProject: IProject, user: IUser): Promise<void> {
+    async updateProject(
+        updatedProject: IProjectUpdate,
+        user: IUser,
+    ): Promise<void> {
         const preData = await this.projectStore.get(updatedProject.id);
 
         await this.projectStore.update(updatedProject);
 
+        // updated project contains instructions to update the project but it may not represent a whole project
+        const afterData = await this.projectStore.get(updatedProject.id);
+
         await this.eventStore.store({
             type: PROJECT_UPDATED,
             project: updatedProject.id,
             createdBy: getCreatedBy(user),
-            data: updatedProject,
+            data: afterData,
             preData,
         });
     }

diff --git a/src/lib/types/model.ts b/src/lib/types/model.ts
@@ -447,6 +447,16 @@ export interface IProject {
     featureNaming?: IFeatureNaming;
 }
 
+// mimics UpdateProjectSchema
+export interface IProjectUpdate {
+    id: string;
+    name: string;
+    description?: string;
+    mode?: ProjectMode;
+    defaultStickiness?: string;
+    featureLimit?: number;
+}
+
 /**
  * Extends IRole making description mandatory
  */