@nina-protocol/nina-db 0.0.89 → 0.0.91

package/dist/knexfile.js

@@ -14,6 +14,15 @@ export default {
         migrations: {
             directory: './node_modules/@nina-protocol/nina-db/dist/migrations',
         },
+        auth: {
+            client: 'postgresql',
+            connection: {
+                host: process.env.AUTH_DB_HOST,
+                user: process.env.AUTH_USER,
+                password: process.env.AUTH_PASSWORD,
+                database: process.env.AUTH_DB_NAME
+            }
+        }
     },
     staging: {
         client: 'postgresql',
@@ -26,6 +35,15 @@ export default {
         migrations: {
             directory: './node_modules/@nina-protocol/nina-db/dist/migrations',
         },
+        auth: {
+            client: 'postgresql',
+            connection: {
+                host: process.env.AUTH_DB_HOST,
+                user: process.env.AUTH_USER,
+                password: process.env.AUTH_PASSWORD,
+                database: process.env.AUTH_DB_NAME
+            }
+        }
     },
     production: {
         client: 'postgresql',
@@ -38,6 +56,23 @@ export default {
         migrations: {
             directory: './node_modules/@nina-protocol/nina-db/dist/migrations',
         },
-        debug: true,
+        auth: {
+            client: 'postgresql',
+            connection: {
+                host: process.env.AUTH_DB_HOST,
+                user: process.env.AUTH_USER,
+                password: process.env.AUTH_PASSWORD,
+                database: process.env.AUTH_DB_NAME
+            }
+        }
+    },
+    knexAuthDB: {
+        client: 'postgresql',
+        connection: {
+            host: process.env.AUTH_DB_HOST,
+            user: process.env.AUTH_USER,
+            password: process.env.AUTH_PASSWORD,
+            database: process.env.AUTH_DB_NAME
+        }
     }
 };

package/dist/migrations/20250120215722_add_ref_columns.js

@@ -0,0 +1,18 @@
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+export const up = function (knex) {
+    return knex.schema.table('subscriptions', table => {
+        table.string('ref').nullable();
+    });
+};
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+export const down = function (knex) {
+    return knex.schema.table('subscriptions', table => {
+        table.dropColumn('ref');
+    });
+};

package/dist/migrations/20250423215722_hubs_collaborators_permissions.js

@@ -0,0 +1,20 @@
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+export const up = function (knex) {
+    return knex.schema.table('hubs_collaborators', table => {
+        table.boolean('can_add_content').defaultTo(true);
+        table.boolean('can_add_collaborators').defaultTo(true);
+    });
+};
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+export const down = function (knex) {
+    return knex.schema.table('hubs_collaborators', table => {
+        table.dropColumn('can_add_content');
+        table.dropColumn('can_add_collaborators');
+    });
+};

package/dist/models/Release.js

@@ -8,8 +8,8 @@ import Hub from './Hub.js';
 import Post from './Post.js';
 import Tag from './Tag.js';
 import axios from 'axios';
-import { customAlphabet } from 'nanoid';
 import promiseRetry from 'promise-retry';
+import { customAlphabet } from 'nanoid';
 const alphabet = '0123456789abcdefghijklmnopqrstuvwxyz';
 const randomStringGenerator = customAlphabet(alphabet, 12);
 export default class Release extends Model {

package/dist/models/Subscription.js

@@ -13,7 +13,6 @@ class Subscription extends Model {
             type: 'object',
             required: ['datetime'],
             properties: {
-                publicKey: { type: 'string' },
                 datetime: { type: 'string' },
                 from: { type: 'string' },
                 to: { type: 'string' },
@@ -24,7 +23,7 @@ class Subscription extends Model {
             },
         };
     }
-    static async findOrCreate({ publicKey, from, to, datetime, subscriptionType }) {
+    static async findOrCreate({ from, to, datetime, subscriptionType }) {
         let subscription = await Subscription.query().findOne({ from, to });
         if (subscription) {
             return subscription;
@@ -32,7 +31,7 @@ class Subscription extends Model {
         subscription = await Subscription.query().insert({
             from, to, datetime, subscriptionType
         });
-        console.log('Inserted subscription: ', publicKey);
+        console.log('Inserted subscription: ', from, to);
         return subscription;
     }
     async format() {

package/package.json

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

package/src/knexfile.js

@@ -2,8 +2,8 @@
  * @type { Object.<string, import("knex").Knex.Config> }
  */
 import "dotenv/config.js";
-export default {
 
+export default {
   development: {
     client: 'postgresql',
     connection: {
@@ -15,6 +15,15 @@ export default {
     migrations: {
       directory: './node_modules/@nina-protocol/nina-db/dist/migrations',
     },
+    auth: {
+      client: 'postgresql',
+      connection: {
+        host:     process.env.AUTH_DB_HOST,
+        user:     process.env.AUTH_USER,
+        password: process.env.AUTH_PASSWORD,
+        database: process.env.AUTH_DB_NAME
+      }
+    }
   },
   staging: {
     client: 'postgresql',
@@ -27,6 +36,15 @@ export default {
     migrations: {
       directory: './node_modules/@nina-protocol/nina-db/dist/migrations',
     },
+    auth: {
+      client: 'postgresql',
+      connection: {
+        host:     process.env.AUTH_DB_HOST,
+        user:     process.env.AUTH_USER,
+        password: process.env.AUTH_PASSWORD,
+        database: process.env.AUTH_DB_NAME
+      }
+    }
   },
   production: {
     client: 'postgresql',
@@ -39,6 +57,23 @@ export default {
     migrations: {
       directory: './node_modules/@nina-protocol/nina-db/dist/migrations',
     },
-    debug: true,
+    auth: {
+      client: 'postgresql',
+      connection: {
+        host:     process.env.AUTH_DB_HOST,
+        user:     process.env.AUTH_USER,
+        password: process.env.AUTH_PASSWORD,
+        database: process.env.AUTH_DB_NAME
+      }
+    }
+  },
+  knexAuthDB: {
+    client: 'postgresql',
+    connection: {
+      host:     process.env.AUTH_DB_HOST,
+      user:     process.env.AUTH_USER,
+      password: process.env.AUTH_PASSWORD,
+      database: process.env.AUTH_DB_NAME
+    }
   }
-};
+};

package/src/migrations/20250120215722_add_ref_columns.js

@@ -0,0 +1,19 @@
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+export const up = function(knex) {
+    return knex.schema.table('subscriptions', table => {
+      table.string('ref').nullable();
+    });
+  };
+  
+  /**
+   * @param { import("knex").Knex } knex
+   * @returns { Promise<void> }
+   */
+  export const down = function(knex) {
+    return knex.schema.table('subscriptions', table => {
+      table.dropColumn('ref');
+    });
+  };

package/src/migrations/20250423215722_hubs_collaborators_permissions.js

@@ -0,0 +1,21 @@
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+export const up = function(knex) {
+  return knex.schema.table('hubs_collaborators', table => {
+    table.boolean('can_add_content').defaultTo(true);
+    table.boolean('can_add_collaborators').defaultTo(true);
+  });
+};
+
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+export const down = function(knex) {
+  return knex.schema.table('hubs_collaborators', table => {
+    table.dropColumn('can_add_content');
+    table.dropColumn('can_add_collaborators');
+  });
+};

package/src/models/Release.js

@@ -8,12 +8,12 @@ import Hub from './Hub.js';
 import Post from './Post.js';
 import Tag from './Tag.js';
 import axios from 'axios';
+import promiseRetry from 'promise-retry';
 import { customAlphabet } from 'nanoid';
 import promiseRetry from 'promise-retry';
 
 const alphabet = '0123456789abcdefghijklmnopqrstuvwxyz';
 const randomStringGenerator = customAlphabet(alphabet, 12);
-
 export default class Release extends Model {
   static tableName = 'releases';
   
@@ -49,7 +49,7 @@ export default class Release extends Model {
       archived: { type: 'boolean' },
     },
   }
-
+  
   static findOrCreate = async (publicKey, hubPublicKey=null) => {
     try {
       let release = await Release.query().findOne({ publicKey });

package/src/models/Subscription.js

@@ -14,7 +14,6 @@ class Subscription extends Model {
       type: 'object',
       required: ['datetime'],
       properties: {
-        publicKey: { type: 'string' },
         datetime: { type: 'string' },
         from: { type: 'string' },
         to: { type: 'string' },
@@ -26,7 +25,7 @@ class Subscription extends Model {
     };
   }
 
-  static async findOrCreate({publicKey, from, to, datetime, subscriptionType}) {
+  static async findOrCreate({from, to, datetime, subscriptionType}) {
     let subscription = await Subscription.query().findOne({ from, to });
     if (subscription) {
       return subscription;
@@ -35,7 +34,7 @@ class Subscription extends Model {
     subscription = await Subscription.query().insert({
       from, to, datetime, subscriptionType
     });
-    console.log('Inserted subscription: ', publicKey)
+    console.log('Inserted subscription: ', from, to)
     return subscription;
   }
 

package/src/node_modules/@nina-protocol/nina-db/dist/migrations/20230306215736_add_hub_updated_at.js

@@ -0,0 +1,15 @@
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.up = function(knex) {
+  
+};
+
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.down = function(knex) {
+  
+};

package/src/node_modules/@nina-protocol/nina-db/dist/migrations/20231031200439_add_profile.js

@@ -0,0 +1,15 @@
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.up = function(knex) {
+  
+};
+
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.down = function(knex) {
+  
+};

package/src/node_modules/@nina-protocol/nina-db/dist/migrations/20231112031833_post_version.js

@@ -0,0 +1,15 @@
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.up = function(knex) {
+  
+};
+
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.down = function(knex) {
+  
+};

package/src/node_modules/@nina-protocol/nina-db/dist/migrations/20231112031850_post_version.js

@@ -0,0 +1,15 @@
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.up = function(knex) {
+  
+};
+
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.down = function(knex) {
+  
+};

package/src/node_modules/@nina-protocol/nina-db/dist/migrations/20231116215059_add_tags.js

@@ -0,0 +1,15 @@
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.up = function(knex) {
+  
+};
+
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.down = function(knex) {
+  
+};