goby-database 2.2.23 → 2.2.25

package/dist/index.d.ts

@@ -76,7 +76,10 @@ export default class Project {
         property_id: number;
         value: any;
     }[]): void;
-    action_make_relations(relations: [input_1: ItemRelationSide, input_2: ItemRelationSide][]): void;
+    action_edit_relations(relations: {
+        change: 'add' | 'remove';
+        sides: [input_1: ItemRelationSide, input_2: ItemRelationSide];
+    }[]): void;
     retrieve_class_items({ class_id, class_name, class_data, pagination }: {
         class_id: number;
         class_name?: string;

package/dist/index.js

@@ -604,7 +604,8 @@ export default class Project {
         // creates table
         this.create_table('junction', id, [
             `"${junction_col_name(sides[0].class_id, sides[0].prop_id)}" INTEGER`,
-            `"${junction_col_name(sides[1].class_id, sides[1].prop_id)}" INTEGER`
+            `"${junction_col_name(sides[1].class_id, sides[1].prop_id)}" INTEGER`,
+            `date_added INTEGER`
         ]);
         return id;
     }
@@ -771,23 +772,33 @@ export default class Project {
             };
         }
     }
-    action_make_relations(relations) {
+    action_edit_relations(relations) {
         // NOTE: changes to make to this in the future:
         //  - for input readability, allow class_name and prop_name as input options, assuming they’re enforced as unique, and use them to look up IDs
         //  - enforce max_values here
         var _a;
-        for (let [input_1, input_2] of relations) {
-            let column_names = {
+        for (let { change, sides } of relations) {
+            const [input_1, input_2] = sides;
+            const column_names = {
                 input_1: junction_col_name(input_1.class_id, input_1.prop_id),
                 input_2: junction_col_name(input_2.class_id, input_2.prop_id)
             };
-            let junction_id = (_a = this.junction_cache.find(j => full_relation_match(j.sides, [input_1, input_2]))) === null || _a === void 0 ? void 0 : _a.id;
+            const junction_id = (_a = this.junction_cache.find(j => full_relation_match(j.sides, [input_1, input_2]))) === null || _a === void 0 ? void 0 : _a.id;
             if (junction_id) {
-                this.db.prepare(`
-                    INSERT INTO junction_${junction_id} 
-                    ("${column_names.input_1}", "${column_names.input_2}") 
-                    VALUES (${input_1.item_id},${input_2.item_id})
-                `).run();
+                if (change == 'add') {
+                    const date_added = Date.now();
+                    this.db.prepare(`
+                        INSERT INTO junction_${junction_id} 
+                        ("${column_names.input_1}", "${column_names.input_2}",date_added) 
+                        VALUES (${input_1.item_id},${input_2.item_id},${date_added})
+                    `).run();
+                }
+                else if (change == 'remove') {
+                    this.db.prepare(`
+                        DELETE FROM junction_${junction_id} 
+                        WHERE "${column_names.input_1}" = ${input_1.item_id}
+                        AND "${column_names.input_2}" = ${input_2.item_id}`).run();
+                }
             }
             else {
                 throw Error('Something went wrong - junction table for relationship not found');
@@ -837,7 +848,7 @@ export default class Project {
                             let target_select = `
                             SELECT 
                                 "${property_junction_column_name}", 
-                                json_object('class_id',${target.class_id},'system_id',junction."${target_junction_column_name}"${label_sql_string}) AS target_data 
+                                json_object('class_id',${target.class_id},'system_id',junction."${target_junction_column_name}"${label_sql_string}) AS target_data, junction.date_added AS date_added
                                 FROM junction_${junction_id} AS junction
                                 LEFT JOIN "class_${target_class === null || target_class === void 0 ? void 0 : target_class.name}" AS target_class ON junction."${target_junction_column_name}" =  target_class.system_id
                             `;
@@ -855,8 +866,10 @@ export default class Project {
                             ${target_selects.join(` 
                             UNION 
                             `)}
+                            ORDER BY date_added
                         )
                         GROUP BY "${property_junction_column_name}"
+
                     )`;
                     cte_strings.push(cte);
                     relation_selections.push(`[${prop.id}_cte].[user_${prop.name}]`);

package/dist/types.d.ts

@@ -23,8 +23,10 @@ export type RelationTarget = {
     prop_id?: number | null;
     junction_id: number;
 };
-export type ItemRelationSide = RelationshipSide & {
+export type ItemRelationSide = {
+    class_id: number;
     item_id: number;
+    prop_id?: number;
 };
 type RelationCreate = {
     type: 'create';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "goby-database",
-  "version": "2.2.23",
+  "version": "2.2.25",
   "description": "This will hold the core better-sqlite3-powered application for creating and modifying goby databases",
   "main": "dist/index.js",
   "files": [