@nina-protocol/nina-db 0.0.65 → 0.0.67

package/dist/index.js

@@ -24,6 +24,7 @@ export const Hub = Models.Hub;
 export const Post = Models.Post;
 export const Release = Models.Release;
 export const Subscription = Models.Subscription;
+export const Tag = Models.Tag;
 export const Transaction = Models.Transaction;
 export const Verification = Models.Verification;
 export const config = knexConfig;

package/dist/migrations/20240304143626_fix_tags_content.js

@@ -0,0 +1,31 @@
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+export const up = function (knex) {
+    return Promise.all([
+        knex.schema.dropTable('tags_content'),
+        knex.schema.createTable('tags_releases', table => {
+            table.primary(['tagId', 'releaseId']);
+            table.integer('releaseId')
+                .unsigned()
+                .references('id')
+                .inTable('releases')
+                .onDelete('CASCADE')
+                .index();
+            table.integer('tagId')
+                .unsigned()
+                .references('id')
+                .inTable('tags')
+                .onDelete('CASCADE')
+                .index();
+        }),
+    ]);
+};
+/**
+* @param { import("knex").Knex } knex
+* @returns { Promise<void> }
+*/
+export const down = function (knex) {
+    return knex.schema.dropTableIfExists('tags_releases');
+};

package/dist/models/Release.js

@@ -245,8 +245,8 @@ export default class Release extends Model {
             join: {
                 from: 'releases.id',
                 through: {
-                    from: 'tags_content.releaseId',
-                    to: 'tags_content.tagId',
+                    from: 'tags_releases.releaseId',
+                    to: 'tags_releases.tagId',
                 },
                 to: 'tags.id',
             },

package/dist/models/Tag.js

@@ -1,4 +1,5 @@
 import { Model } from 'objection';
+import Release from './Release.js';
 export default class Tag extends Model {
     static tableName = 'tags';
     static idColumn = 'id';
@@ -9,37 +10,25 @@ export default class Tag extends Model {
             value: { type: 'string' },
         },
     };
-    async findOrCreate(value) {
+    static findOrCreate = async (value) => {
         let tag = await Tag.query().where('value', value).first();
         if (!tag) {
             tag = await Tag.query().insert({ value });
         }
         return tag;
-    }
-    async format() {
+    };
+    format = () => {
         delete this.id;
-    }
+    };
     static relationMappings = () => ({
-        posts: {
-            relation: Model.ManyToManyRelation,
-            modelClass: 'Post',
-            join: {
-                from: 'tags.id',
-                through: {
-                    from: 'tags_content.tagId',
-                    to: 'tags_content.postId',
-                },
-                to: 'posts.id',
-            },
-        },
         releases: {
             relation: Model.ManyToManyRelation,
-            modelClass: 'Release',
+            modelClass: Release,
             join: {
                 from: 'tags.id',
                 through: {
-                    from: 'tags_content.tagId',
-                    to: 'tags_content.releaseId',
+                    from: 'tags_releases.tagId',
+                    to: 'tags_releases.releaseId',
                 },
                 to: 'releases.id',
             },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nina-protocol/nina-db",
-  "version": "0.0.65",
+  "version": "0.0.67",
   "description": "",
   "source": "src/index.js",
   "main": "dist/index.js",

package/src/index.js

@@ -31,6 +31,7 @@ export const Hub = Models.Hub
 export const Post = Models.Post
 export const Release = Models.Release
 export const Subscription = Models.Subscription
+export const Tag = Models.Tag
 export const Transaction = Models.Transaction
 export const Verification = Models.Verification
 export const config = knexConfig

package/src/migrations/20240304143626_tags_releases.js

@@ -0,0 +1,30 @@
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+export const up = function (knex) {
+  return Promise.all([
+      knex.schema.createTable('tags_releases', table => {
+          table.primary(['tagId', 'releaseId']);
+          table.integer('releaseId')
+              .unsigned()
+              .references('id')
+              .inTable('releases')
+              .onDelete('CASCADE')
+              .index();
+          table.integer('tagId')
+              .unsigned()
+              .references('id')
+              .inTable('tags')
+              .onDelete('CASCADE')
+              .index();
+      }),
+  ]);
+};
+/**
+* @param { import("knex").Knex } knex
+* @returns { Promise<void> }
+*/
+export const down = function (knex) {
+  return knex.schema.dropTableIfExists('tags_releases');
+};

package/src/models/Release.js

@@ -261,8 +261,8 @@ export default class Release extends Model {
       join: {
         from: 'releases.id',
         through: {
-          from: 'tags_content.releaseId',
-          to: 'tags_content.tagId',
+          from: 'tags_releases.releaseId',
+          to: 'tags_releases.tagId',
         },
         to: 'tags.id',
       },

package/src/models/Tag.js

@@ -1,4 +1,5 @@
 import { Model } from 'objection';
+import Release from './Release.js';
 
 export default class Tag extends Model {
   static tableName = 'tags';
@@ -11,7 +12,7 @@ export default class Tag extends Model {
     },
   }
 
-  async findOrCreate(value) {
+  static findOrCreate = async (value) => {
     let tag = await Tag.query().where('value', value).first();
     if (!tag) {
       tag = await Tag.query().insert({ value });
@@ -19,31 +20,19 @@ export default class Tag extends Model {
     return tag;
   }
 
-  async format () {
+  format = () => {
     delete this.id
   }
 
   static relationMappings = () => ({
-    posts: {
-      relation: Model.ManyToManyRelation,
-      modelClass: 'Post',
-      join: {
-        from: 'tags.id',
-        through: {
-          from: 'tags_content.tagId',
-          to: 'tags_content.postId',
-        },
-        to: 'posts.id',
-      },
-    },
     releases: {
       relation: Model.ManyToManyRelation,
-      modelClass: 'Release',
+      modelClass: Release,
       join: {
         from: 'tags.id',
         through: {
-          from: 'tags_content.tagId',
-          to: 'tags_content.releaseId',
+          from: 'tags_releases.tagId',
+          to: 'tags_releases.releaseId',
         },
         to: 'releases.id',
       },