Merge branch 'main' into release

awesome/database/constants.js

@@ -11,7 +11,8 @@ const TABLES = {
   COURSE_ORGANIZATIONS: "CourseOrganizations",
   USER_COURSES: "UserCourses",
   TUTORIAL_TAGS: "TutorialTags",
-  USER_TUTORIALS: "UserTutorials"
+  USER_TUTORIALS: "UserTutorials",
+  USER_TAGS: "UserTags",
 };
 
 const DIRECTUS_TABLES = {

awesome/database/migrations/20231018015225_025_create_UserTags_table.js

@@ -0,0 +1,25 @@
+const databaseOperations = require("../utils");
+const { TABLES } = require("../constants");
+
+const TABLE_NAME = TABLES.USER_TAGS;
+
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.up = function (knex) {
+  return databaseOperations.createTable(knex, TABLE_NAME, (table) => {
+    table.string("id").primary().notNullable();
+    table.string("tagId").references("id").inTable(TABLES.TAG).notNullable();
+    table.string("userId").references("id").inTable(TABLES.USER).notNullable();
+    table.timestamps(true, true, true);
+  });
+};
+
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.down = function (knex) {
+  return knex.schema.dropTable(TABLE_NAME);
+};

awesome/database/migrations/20231018022620_026_insert_directus_fields_for_UserTags_tables.js

@@ -0,0 +1,34 @@
+const { TABLES, DIRECTUS_TABLES } = require("../constants");
+const directusUtil = require("../utils/directus")
+
+const TABLE_NAME=TABLES.USER_TAGS;
+
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.up = async function (knex) {
+    const exists = await knex.schema.hasTable(DIRECTUS_TABLES.DIRECTUS_FIELDS);
+    if (exists) {
+        await directusUtil.insertIdFields(knex, [TABLE_NAME]);
+        await directusUtil.insertTimeFields(knex, [TABLE_NAME], "createdAt", "3");
+        await directusUtil.insertTimeFields(knex, [TABLE_NAME], "updatedAt", "4");
+        await directusUtil.insertForeignIdFields(knex, [TABLE_NAME], "userId", "{{name}}");
+        await directusUtil.insertForeignIdFields(knex, [TABLE_NAME], "tagId", "{{name}}");
+    }
+};
+
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.down = async function (knex) {
+    const exists = await knex.schema.hasTable(DIRECTUS_TABLES.DIRECTUS_FIELDS);
+    if (exists) {
+        await directusUtil.deleteField(knex, [TABLE_NAME], "id");
+        await directusUtil.deleteField(knex, [TABLE_NAME], "createdAt");
+        await directusUtil.deleteField(knex, [TABLE_NAME], "updatedAt");
+        await directusUtil.deleteField(knex, [TABLE_NAME], "userId");
+        await directusUtil.deleteField(knex, [TABLE_NAME], "tagId");
+    }
+};

awesome/database/utils/directus.js

@@ -107,7 +107,7 @@ async function insertForeignIdFields(
   );
 }
 
-async function deleteFields(
+async function deleteField(
   knex,
   tables,
   field