fix: Fix styles, refactoring

server/api/controllers/cards/create.js

@@ -56,9 +56,11 @@ module.exports = {
     dueDate: {
       type: 'string',
       custom: dueDateValidator,
+      allowNull: true,
     },
-    dueCompleted: {
+    isDueDateCompleted: {
       type: 'boolean',
+      allowNull: true,
     },
     stopwatch: {
       type: 'json',
@@ -103,7 +105,7 @@ module.exports = {
       'name',
       'description',
       'dueDate',
-      'dueCompleted',
+      'isDueDateCompleted',
       'stopwatch',
     ]);
 

server/api/controllers/cards/update.js

@@ -80,8 +80,9 @@ module.exports = {
       custom: dueDateValidator,
       allowNull: true,
     },
-    dueCompleted: {
+    isDueDateCompleted: {
       type: 'boolean',
+      allowNull: true,
     },
     stopwatch: {
       type: 'json',
@@ -176,7 +177,7 @@ module.exports = {
       'name',
       'description',
       'dueDate',
-      'dueCompleted',
+      'isDueDateCompleted',
       'stopwatch',
       'isSubscribed',
     ]);

server/api/helpers/cards/create-one.js

@@ -49,6 +49,14 @@ module.exports = {
       throw 'positionMustBeInValues';
     }
 
+    if (values.dueDate) {
+      if (_.isNil(values.isDueDateCompleted)) {
+        values.isDueDateCompleted = false;
+      }
+    } else {
+      delete values.isDueDateCompleted;
+    }
+
     const cards = await sails.helpers.lists.getCards(values.list.id);
 
     const { position, repositions } = sails.helpers.utils.insertToPositionables(

server/api/helpers/cards/duplicate-one.js

@@ -77,7 +77,7 @@ module.exports = {
         'name',
         'description',
         'dueDate',
-        'dueCompleted',
+        'isDueDateCompleted',
         'stopwatch',
       ]),
       ...values,

server/api/helpers/cards/update-one.js

@@ -135,6 +135,20 @@ module.exports = {
       });
     }
 
+    const dueDate = _.isUndefined(values.dueDate) ? inputs.record.dueDate : values.dueDate;
+
+    if (dueDate) {
+      const isDueDateCompleted = _.isUndefined(values.isDueDateCompleted)
+        ? inputs.record.isDueDateCompleted
+        : values.isDueDateCompleted;
+
+      if (_.isNull(isDueDateCompleted)) {
+        values.isDueDateCompleted = false;
+      }
+    } else {
+      values.isDueDateCompleted = null;
+    }
+
     let card;
     if (_.isEmpty(values)) {
       card = inputs.record;

server/api/models/Card.js

@@ -28,10 +28,10 @@ module.exports = {
       type: 'ref',
       columnName: 'due_date',
     },
-    dueCompleted: {
+    isDueDateCompleted: {
       type: 'boolean',
-      defaultsTo: false,
-      columnName: 'due_completed',
+      allowNull: true,
+      columnName: 'is_due_date_completed',
     },
     stopwatch: {
       type: 'json',

server/db/migrations/20240812065305_add_due_completion.js.js

@@ -1,12 +0,0 @@
-module.exports.up = async (knex) =>
-  knex.schema.table('card', (table) => {
-    /* Columns */
-
-    table.boolean('due_completed').notNullable().defaultTo(false);
-  });
-
-module.exports.down = async (knex) => {
-  await knex.schema.table('card', (table) => {
-    table.dropColumn('due_completed');
-  });
-};

server/db/migrations/20240812065305_make_due_date_toggleable.js

@@ -0,0 +1,18 @@
+module.exports.up = async (knex) => {
+  await knex.schema.table('card', (table) => {
+    /* Columns */
+
+    table.boolean('is_due_date_completed');
+  });
+
+  return knex('card')
+    .update({
+      isDueDateCompleted: false,
+    })
+    .whereNotNull('due_date');
+};
+
+module.exports.down = (knex) =>
+  knex.schema.table('card', (table) => {
+    table.dropColumn('is_due_date_completed');
+  });