@xuda.io/account_module 1.2.1263 → 1.2.1265

package/index.mjs

@@ -1436,7 +1436,7 @@ export const get_contact_info = async function (uid, contact_doc, _id) {
       } catch (err) {
         if (err.message === 'deleted') {
           try {
-            let contact_doc = await db_module.get_couch_doc_native('xuda_contacts', doc._id);
+            let contact_doc = await get_contact(uid, doc._id);
             contact_doc.team_req_id = '';
             await db_module.save_couch_doc('xuda_contacts', contact_doc);
           } catch (error) {}
@@ -1554,7 +1554,7 @@ export const get_pending_share_contact_in = async function (uid, _id) {
   const requests_from_res = await db_module.find_couch_query('xuda_team', from_opt);
 
   for await (let e of requests_from_res.docs) {
-    let doc = await db_module.get_couch_doc_native('xuda_contacts', e.share_item_id);
+    let doc = await get_contact(uid, e.share_item_id);
     delete doc.contact_mood_level;
     doc.shared_from_uid = e.team_req_from_uid;
     doc.pending = true;
@@ -2019,7 +2019,7 @@ export const onboarding_completed = async function (req, job_id, headers) {
 
 export const ts_contact = async function (contact_id) {
   try {
-    const contact_doc = await db_module.get_couch_doc_native('xuda_contacts', contact_id);
+    const contact_doc = await get_contact(uid, contact_id);
     contact_doc.ts = Date.now();
     const save_ret = await db_module.save_couch_doc('xuda_contacts', contact_doc);
     return save_ret;
@@ -2188,144 +2188,147 @@ export const add_contact = async function (req, job_id, headers) {
 
 export const get_contacts = async function (req) {
   const { _id, uid, name, limit, skip, bookmark, search, filter_type = 'all', contact_id } = req;
+  try {
+    const account_profile_info = await get_active_account_profile_info(uid);
+    if (_id) {
+      let data = await db_module.get_couch_doc('xuda_contacts', _id);
+      return data;
+    }
 
-  const account_profile_info = await get_active_account_profile_info(uid);
-  if (_id) {
-    let data = await db_module.get_couch_doc('xuda_contacts', _id);
-    return data;
-  }
+    let { with_requests } = req;
+    var opt = {
+      selector: {
+        docType: 'contact',
+        uid: account_profile_info.uid,
+        stat: { $lt: 4 },
+      },
+      limit: limit || 9999,
+      skip: skip || 0,
+      sort: [{ ts: 'desc' }],
+    };
 
-  let { with_requests } = req;
-  var opt = {
-    selector: {
-      docType: 'contact',
-      uid: account_profile_info.uid,
-      stat: { $lt: 4 },
-    },
-    limit: limit || 9999,
-    skip: skip || 0,
-    sort: [{ ts: 'desc' }],
-  };
+    switch (filter_type) {
+      case 'archived': {
+        opt.selector.stat = 5;
+        break;
+      }
+      case 'shared': {
+        opt.selector.shared_from_uid = { $gt: null };
+        break;
+      }
 
-  switch (filter_type) {
-    case 'archived': {
-      opt.selector.stat = 5;
-      break;
-    }
-    case 'shared': {
-      opt.selector.shared_from_uid = { $gt: null };
-      break;
-    }
+      case 'pinned': {
+        opt.selector.pinned = true;
+        break;
+      }
 
-    case 'pinned': {
-      opt.selector.pinned = true;
-      break;
-    }
+      case 'online': {
+        opt.limit = 9999;
+        break;
+      }
 
-    case 'online': {
-      opt.limit = 9999;
-      break;
+      default:
+        with_requests = true;
+        break;
     }
 
-    default:
-      with_requests = true;
-      break;
-  }
-
-  if (_id) {
-    opt.selector._id = _id;
-  }
+    if (_id) {
+      opt.selector._id = _id;
+    }
 
-  if (contact_id) {
-    opt.selector._id = contact_id;
-  }
+    if (contact_id) {
+      opt.selector._id = contact_id;
+    }
 
-  if (typeof name !== 'undefined') {
-    opt.selector.name = { $regex: `(?i)${name}` };
-  }
+    if (typeof name !== 'undefined') {
+      opt.selector.name = { $regex: `(?i)${name}` };
+    }
 
-  if (typeof search !== 'undefined') {
-    opt.selector['$or'] = [
-      {
-        name: {
-          $regex: `(?i)${search}`,
+    if (typeof search !== 'undefined') {
+      opt.selector['$or'] = [
+        {
+          name: {
+            $regex: `(?i)${search}`,
+          },
         },
-      },
-      {
-        email: {
-          $regex: `(?i)${search}`,
+        {
+          email: {
+            $regex: `(?i)${search}`,
+          },
         },
-      },
-    ];
-  }
+      ];
+    }
 
-  if (bookmark && bookmark !== 'nil') {
-    opt.bookmark = bookmark;
-  }
+    if (bookmark && bookmark !== 'nil') {
+      opt.bookmark = bookmark;
+    }
 
-  let contacts = { docs: [], total_docs: 0 };
+    let contacts = { docs: [], total_docs: 0 };
 
-  if (filter_type !== 'pending') {
-    contacts = await db_module.find_couch_query('xuda_contacts', opt);
-    if (!limit || contact_id) {
-      contacts.total_docs = contacts.docs.length;
-    } else {
-      delete opt.sort;
-      delete opt.skip;
-      opt.limit = 9999;
-      opt.fields = ['_id'];
+    if (filter_type !== 'pending') {
+      contacts = await db_module.find_couch_query('xuda_contacts', opt);
+      if (!limit || contact_id) {
+        contacts.total_docs = contacts.docs.length;
+      } else {
+        delete opt.sort;
+        delete opt.skip;
+        opt.limit = 9999;
+        opt.fields = ['_id'];
 
-      const counter = await db_module.find_couch_query('xuda_contacts', opt);
-      contacts.total_docs = counter.docs.length;
+        const counter = await db_module.find_couch_query('xuda_contacts', opt);
+        contacts.total_docs = counter.docs.length;
+      }
     }
-  }
 
-  let requests_to = { docs: [], total_docs: 0 };
-  let requests_from = { docs: [], total_docs: 0 };
-  let shared_from = { docs: [], total_docs: 0 };
+    let requests_to = { docs: [], total_docs: 0 };
+    let requests_from = { docs: [], total_docs: 0 };
+    let shared_from = { docs: [], total_docs: 0 };
 
-  let contact_docs = { docs: [], total_docs: contacts.total_docs };
-  for await (let doc of contacts.docs) {
-    const ret_to = requests_to.docs.find((e) => {
-      return e.contact_uid === doc.contact_uid;
-    });
-    if (ret_to) continue;
+    let contact_docs = { docs: [], total_docs: contacts.total_docs };
+    for await (let doc of contacts.docs) {
+      const ret_to = requests_to.docs.find((e) => {
+        return e.contact_uid === doc.contact_uid;
+      });
+      if (ret_to) continue;
 
-    const ret_from = requests_from.docs.find((e) => {
-      return e.contact_uid === doc.contact_uid;
-    });
-    if (ret_from) continue;
+      const ret_from = requests_from.docs.find((e) => {
+        return e.contact_uid === doc.contact_uid;
+      });
+      if (ret_from) continue;
 
-    doc = await get_contact_info(uid, doc);
+      doc = await get_contact_info(uid, doc);
 
-    if (filter_type === 'online') {
-      if (!doc.online) continue;
-    }
+      if (filter_type === 'online') {
+        if (!doc.online) continue;
+      }
 
-    contact_docs.docs.push(doc);
-  }
+      contact_docs.docs.push(doc);
+    }
 
-  if (!contact_id && with_requests) {
-    if (filter_type === 'pending') {
-      ////// TO - OUT
-      requests_to.docs = await get_pending_contact_out(uid);
-      requests_to.total_docs = requests_to.docs.length;
+    if (!contact_id && with_requests) {
+      if (filter_type === 'pending') {
+        ////// TO - OUT
+        requests_to.docs = await get_pending_contact_out(uid);
+        requests_to.total_docs = requests_to.docs.length;
 
-      ////// FROM - IN
-      requests_from.docs = await get_pending_contact_in(uid);
-      requests_from.total_docs = requests_from.docs.length;
-      shared_from.docs = await get_pending_share_contact_in(uid);
-      shared_from.total_docs = shared_from.docs.length;
+        ////// FROM - IN
+        requests_from.docs = await get_pending_contact_in(uid);
+        requests_from.total_docs = requests_from.docs.length;
+        shared_from.docs = await get_pending_share_contact_in(uid);
+        shared_from.total_docs = shared_from.docs.length;
+      }
     }
-  }
 
-  return {
-    code: 1,
-    data: {
-      docs: [...shared_from.docs, ...requests_from.docs, ...requests_to.docs, ...contact_docs.docs],
-      total_docs: shared_from.total_docs + requests_from.total_docs + requests_to.total_docs + contact_docs.total_docs,
-    },
-  };
+    return {
+      code: 1,
+      data: {
+        docs: [...shared_from.docs, ...requests_from.docs, ...requests_to.docs, ...contact_docs.docs],
+        total_docs: shared_from.total_docs + requests_from.total_docs + requests_to.total_docs + contact_docs.total_docs,
+      },
+    };
+  } catch (err) {
+    return { code: -34, data: err.message };
+  }
 };
 
 export const archive_contact = async function (req) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xuda.io/account_module",
-  "version": "1.2.1263",
+  "version": "1.2.1265",
   "description": "Xuda Account Server Module",
   "main": "index.mjs",
   "dependencies": {