refactor: centralize field update logic (#140)

in preparation of #136

Author: gr2m

api/items.add-draft.js

@@ -3,8 +3,8 @@
 import { addDraftIssueToProjectMutation } from "./lib/queries.js";
 import { projectItemNodeToGitHubProjectItem } from "./lib/project-item-node-to-github-project-item.js";
 import { getStateWithProjectFields } from "./lib/get-state-with-project-fields.js";
-import { getFieldsUpdateQueryAndFields } from "./lib/get-fields-update-query-and-fields.js";
 import { removeObjectKeys } from "./lib/remove-object-keys.js";
+import { updateItemFields } from "./lib/update-project-item-fields.js";
 
 /**
  * Creates draft item in project.
@@ -38,30 +38,24 @@ export async function addDraftItem(project, state, content, fields) {
   const nonExistingProjectFields = Object.entries(stateWithFields.fields)
     .filter(([, field]) => field.existsInProject === false)
     .map(([key]) => key);
-  const existingProjectFieldKeys = Object.keys(fields).filter(
-    (key) => !nonExistingProjectFields.includes(key)
+
+  const fieldsAfterUpdate = await updateItemFields(
+    project,
+    state,
+    draftItem.id,
+    fields
   );
 
-  if (existingProjectFieldKeys.length === 0)
+  if (!fieldsAfterUpdate) {
     return {
       ...draftItem,
       // @ts-expect-error - complaints that built-in fields `title` and `status` might not exist, but we are good here
       fields: removeObjectKeys(draftItem.fields, nonExistingProjectFields),
     };
-
-  const existingFields = Object.fromEntries(
-    existingProjectFieldKeys.map((key) => [key, fields[key]])
-  );
-
-  const result = getFieldsUpdateQueryAndFields(stateWithFields, existingFields);
-
-  await project.octokit.graphql(result.query, {
-    projectId: stateWithFields.id,
-    itemId: draftItem.id,
-  });
+  }
 
   return {
     ...draftItem,
-    fields: result.fields,
+    fields: fieldsAfterUpdate,
   };
 }

api/items.add.js

@@ -3,8 +3,8 @@
 import { addIssueToProjectMutation } from "./lib/queries.js";
 import { projectItemNodeToGitHubProjectItem } from "./lib/project-item-node-to-github-project-item.js";
 import { getStateWithProjectFields } from "./lib/get-state-with-project-fields.js";
-import { getFieldsUpdateQueryAndFields } from "./lib/get-fields-update-query-and-fields.js";
 import { removeObjectKeys } from "./lib/remove-object-keys.js";
+import { updateItemFields } from "./lib/update-project-item-fields.js";
 
 /**
  * Adds new item to project.
@@ -33,30 +33,24 @@ export async function addItem(project, state, contentNodeId, fields) {
   const nonExistingProjectFields = Object.entries(stateWithFields.fields)
     .filter(([, field]) => field.existsInProject === false)
     .map(([key]) => key);
-  const existingProjectFieldKeys = Object.keys(fields).filter(
-    (key) => !nonExistingProjectFields.includes(key)
+
+  const fieldsAfterUpdate = await updateItemFields(
+    project,
+    state,
+    newItem.id,
+    fields
   );
 
-  if (existingProjectFieldKeys.length === 0)
+  if (!fieldsAfterUpdate) {
     return {
       ...newItem,
       // @ts-expect-error - complaints that built-in fields `title` and `status` might not exist, but we are good here
       fields: removeObjectKeys(newItem.fields, nonExistingProjectFields),
     };
-
-  const existingFields = Object.fromEntries(
-    existingProjectFieldKeys.map((key) => [key, fields[key]])
-  );
-
-  const result = getFieldsUpdateQueryAndFields(stateWithFields, existingFields);
-
-  await project.octokit.graphql(result.query, {
-    projectId: stateWithFields.id,
-    itemId: newItem.id,
-  });
+  }
 
   return {
     ...newItem,
-    fields: result.fields,
+    fields: fieldsAfterUpdate,
   };
 }