corebasic 1.0.204 → 1.0.206

package/libs/dip.js

@@ -18,6 +18,9 @@ export const companyMeta = Elabase.companyMeta
 export const outletMeta = Elabase.outletMeta
 export const customMeta = Elabase.customMeta
 export const schema = Elabase.schema
+export const isDipMeta = Elabase.isDipMeta
+export const excludeCollectionConfig = Elabase.excludeCollectionConfig
+export const includeCollectionConfig = Elabase.includeCollectionConfig
 
 export const shard_stats = Elabase.shard_stats
 export let config = Elabase.config
@@ -88,7 +91,7 @@ export const idip = async (message, callback, cleanup) => {
 
 
 export const insertKeys = (message, meta) => {
-    if (!(meta instanceof DipMeta)) throw {message: 'Error: Provided meta is not an instance of DipMeta in Dip.insertKeys()'}
+    if (!isDipMeta(meta)) throw {message: 'Error: Provided meta is not an instance of DipMeta in Dip.insertKeys()'}
     return {
         "created": message.date, "updated": message.date,
         "createdBy": message.meta.staff,

package/libs/elabase.js

@@ -67,7 +67,7 @@ class DipMeta {
         Object.freeze(this);
     }
 }
-
+export const isDipMeta = meta => meta instanceof DipMeta
 
 export const globalMeta = args => {
     return new DipMeta({ ...args, company: "GLOBAL", outlet: "GLOBAL" })
@@ -255,6 +255,13 @@ function init_collections_config() {
 if (COLLECTIONS_JSON)
     init_collections_config()
 
+const EXCLUDED_COLLECTIONS_CONFIG = {}
+export function excludeCollectionConfig(collection) {
+    EXCLUDED_COLLECTIONS_CONFIG[collection] = true
+}
+export function includeCollectionConfig(collection) {
+    delete EXCLUDED_COLLECTIONS_CONFIG[collection]
+}
 
 function validate_topology(meta, collection, fn_name) {
 
@@ -262,7 +269,8 @@ function validate_topology(meta, collection, fn_name) {
 
     let config = COLLECTIONS_JSON?.[collection]
     if (!config) {
-        console.warn(`Warn: Missing config for collection: ${collection}${fn_name ? ` ${fn_name}` : ''}`)
+        if (!EXCLUDED_COLLECTIONS_CONFIG[collection])
+            console.warn(`Warn: Missing config for collection: ${collection}${fn_name ? ` ${fn_name}` : ''}`)
         return new_meta
     }
 

package/libs/features.js

@@ -217,6 +217,9 @@ function registerApi() {
 }
 
 export const start = async (app, url, file) => {
+    const globalMeta = Dip.globalMeta()
+    Dip.excludeCollectionConfig("users.txns")
+    Dip.excludeCollectionConfig("Features.txns")
     ExpressApp = app
     PROJECT_ROOT_URL = url
     features = await Utils.fileToJson(url, file)
@@ -257,9 +260,12 @@ export const start = async (app, url, file) => {
             topic = topic.replace(/^.*Features./,'')
             while (true) {
                 try {
-                    await Dip.update(message.meta, `users.txns.${message.user}`, {_id: message.txn}, { $setOnInsert: { user: message.user, feature: message.feature, date: message.date, created: message.date, updated: message.date, status: "Queued" } }, {upsert: true}) // Can always update the status later
+                    // const iso_date = new Date(message.date).toISOString()
+                    // // TODO: use $useChunks: [] once support is added in dip insert
+                    // await Dip.insert(globalMeta, `users.txns`, { _id: `${message.user}_${iso_date}_${message.txn}`, user: message.user, feature: message.feature, date: message.date, created: message.date, updated: message.date, status: "Queued" }, {idempotent: true}) // Can always update the status later
+                    // TODO: Avoid duplicate processing
                     await features[message.feature].handler(topic, message)
-                    await Dip.insert(message.meta, "Features.txns", {_id: message.txn, status: "Processed"})
+                    await Dip.insert(globalMeta, "Features.txns", {_id: message.txn, status: "Processed"}, {idempotent: true})
                     break
                 } catch(err) {
                     if (process.env.DEBUG_MODE)
@@ -276,7 +282,7 @@ export const start = async (app, url, file) => {
     // Transaction status api
     app.get('/transactions/:id', async (req, res) => { // Front end calls this as a regular feature call. so `req.meta` exists
         try {
-            let items = await Dip.query(req.meta, "Features.txns", {_id: req.params.id})
+            let items = await Dip.query(globalMeta, "Features.txns", {_id: req.params.id})
             if (items.length)
                 res.json({ data: { ...items[0], txn: items._id } })
             else
@@ -285,13 +291,17 @@ export const start = async (app, url, file) => {
             res.status(500).json({ message: "Failed to retreive data" })
         }
     })
-    app.get('/users/:id/transactions', async (req, res) => {
-        try {
-            res.json({ data: await Dip.query(req.meta, `users.txns.${req.params.id}`, {}, { $orderby: { date: -1 } }) })
-        } catch {
-            res.status(500).json({ message: "Failed to retreive data" })
-        }
-    })
+    // app.get('/users/:id/transactions', async (req, res) => {
+    //     try {
+    //         const idPrefix = `${req.params.id}_`
+    //         // TODO: use $useChunks: [] once support is added in dip insert
+    //         // TODO: remove $orderby: { date: -1 } and remove $orderby: { _id: -1 }
+    //         // res.json({ data: await Dip.query(globalMeta, `users.txns`, {}, { $rangeFrom: idPrefix, $rangeTo: idPrefix, $rangeDirection: -1, $rangeInclusive: true, $orderby: { date: -1 } }) })
+    //         res.json({ data: await Dip.query(globalMeta, `users.txns`, {}, { $rangeFrom: idPrefix, $rangeTo: idPrefix, $rangeDirection: -1, $rangeInclusive: true, $orderby: { _id: -1 } }) })
+    //     } catch {
+    //         res.status(500).json({ message: "Failed to retreive data" })
+    //     }
+    // })
 
     try { await Messaging.start(app) } catch { console.log('Messaging failed to start. Maybe missing redis') }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "corebasic",
   "type": "module",
-  "version": "1.0.204",
+  "version": "1.0.206",
   "description": "",
   "main": "index.js",
   "scripts": {