@ozdao/prometheus-framework 0.1.30 → 0.1.31

package/dist/organizations.client.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./organizations.client-85a2ae66.js"),i=require("./CardOrganization-bf366e4e.js"),t=require("./Socials-821bd677.js"),n=require("./Publics-4438ca51.js"),r=require("./ButtonFollow-7c0180b3.js"),a=require("./organizations-bb8f676d.js");require("vue");require("vue-router");require("vue-i18n");require("./globals-928eb13c.js");require("./Breadcrumbs.vue_vue_type_style_index_0_lang-f3d37f29.js");require("./index-7ecbf72a.js");require("./_plugin-vue_export-helper-f246444f.js");require("./Tab-6f0a4909.js");require("./inputs.validation-24ae76b9.js");require("./Feed-bfd7d1d9.js");require("./EmptyState-7658d7d6.js");require("./Chips-493042f7.js");require("./IconEdit-4cfe2115.js");require("./Button-ee08e6bf.js");require("./Feed-aee74095.js");require("./auth-2f9b2dfc.js");require("./Select.vue_vue_type_style_index_0_scoped_a78dbba1_lang-0ea8fbf8.js");require("./UploadImage-33f6a9f4.js");require("./Select-b9299fb6.js");require("./auth.validation-30bb0efd.js");exports.Contacts=e._sfc_main$9;exports.Department=e._sfc_main$2;exports.DepartmentEdit=e.DepartmentEdit;exports.DepartmentMemberModify=e.DepartmentMemberModify;exports.DepartmentSection=e.Department;exports.DepartmentSub=e.DepartmentSub;exports.DepartmentSubDepartmentModify=e.DepartmentSubDepartmentModify;exports.DetailsTab=e._sfc_main$13;exports.Documents=e.Documents;exports.EditArray=e._sfc_main$6;exports.EmptyState=e._sfc_main$8;exports.MembersAdd=e._sfc_main$11;exports.MembersList=e._sfc_main$15;exports.MembersTab=e._sfc_main$14;exports.Organization=e._sfc_main$1;exports.OrganizationEdit=e._sfc_main$4;exports.Organizations=e._sfc_main$5;exports.OrganizationsAccount=e._sfc_main$3;exports.OrganizationsSection=e._sfc_main$16;exports.Places=e.Places;exports.Rating=e._sfc_main$10;exports.StructureTab=e._sfc_main$12;exports.Unit=e._sfc_main$7;exports.User=e.User;exports.invitesStore=e.invites;exports.organizationsRoutes=e.organizations;exports.CardOrganization=i._sfc_main;exports.Socials=t._sfc_main;exports.Publics=n._sfc_main;exports.ButtonFollow=r.ButtonFollow;exports.membershipsStore=r.memberships;exports.organizationStore=a.organizations;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./organizations.client-292e8444.js"),r=require("./CardOrganization-7d679e75.js"),i=require("./Socials-b19d0cb1.js"),t=require("./Publics-50c0ff6c.js"),n=require("./organizations-a241b21d.js"),a=require("./IconEdit-e4d0cc6e.js");require("vue");require("vue-router");require("vue-i18n");require("./globals-928eb13c.js");require("./Breadcrumbs.vue_vue_type_style_index_0_lang-505c3ca5.js");require("./index-b41aac19.js");require("./_plugin-vue_export-helper-f246444f.js");require("./Tab-6f0a4909.js");require("./inputs.validation-24ae76b9.js");require("./Button.vue_vue_type_style_index_0_lang-0ea8fbf8.js");require("./auth-acbe3ae1.js");require("./ButtonFollow.vue_vue_type_style_index_0_scoped_0634d4a1_lang-0ea8fbf8.js");require("./Feed-66095e66.js");require("./EmptyState-7658d7d6.js");require("./Chips-8d0a1d2c.js");require("./Feed-e55bc6fa.js");require("./Select-3ca5ab39.js");require("./reports-270f69df.js");require("./Button-2ca405bd.js");require("./UploadImage-0f488170.js");require("./auth.validation-495e9d6d.js");require("./click-outside-0b0727d1.js");exports.Contacts=e._sfc_main$9;exports.Department=e._sfc_main$2;exports.DepartmentEdit=e.DepartmentEdit;exports.DepartmentMemberModify=e.DepartmentMemberModify;exports.DepartmentSection=e.Department;exports.DepartmentSub=e.DepartmentSub;exports.DepartmentSubDepartmentModify=e.DepartmentSubDepartmentModify;exports.DetailsTab=e._sfc_main$13;exports.Documents=e.Documents;exports.EditArray=e._sfc_main$6;exports.EmptyState=e._sfc_main$8;exports.MembersAdd=e._sfc_main$11;exports.MembersList=e._sfc_main$15;exports.MembersTab=e._sfc_main$14;exports.Organization=e._sfc_main$1;exports.OrganizationEdit=e._sfc_main$4;exports.Organizations=e._sfc_main$5;exports.OrganizationsAccount=e._sfc_main$3;exports.OrganizationsSection=e._sfc_main$16;exports.Places=e.Places;exports.Rating=e._sfc_main$10;exports.StructureTab=e._sfc_main$12;exports.Unit=e._sfc_main$7;exports.User=e.User;exports.invitesStore=e.invites;exports.organizationsRoutes=e.organizations;exports.ButtonFollow=r.ButtonFollow;exports.CardOrganization=r._sfc_main;exports.Socials=i._sfc_main$1;exports.Publics=t._sfc_main;exports.organizationStore=n.organizations;exports.membershipsStore=a.memberships;

package/dist/organizations.client.js

@@ -1,60 +1,62 @@
-import { o as O, e as y, D as A, l as E, x as P, k as T, m as U, t as _, v as h, i as v, n as w, q as B, w as C, u as R, d as j, g as k, h as q, f as F, y as L, P as G, p as H, r as I, j as J, U as K, z as N, A as Q } from "./organizations.client-39196bef.mjs";
-import { _ as W } from "./CardOrganization-3f4a13d3.mjs";
-import { _ as Y } from "./Socials-8193477c.mjs";
-import { _ as $ } from "./Publics-538180a8.mjs";
-import { B as at, b as rt } from "./ButtonFollow-00d85977.mjs";
-import { o as it } from "./organizations-aed4245d.mjs";
+import { o as A, e as E, D as P, l as T, x as U, k as h, m as v, t as w, v as B, i as C, n as R, q as _, w as j, u as k, d as q, g as F, h as L, f as G, y as H, P as I, p as J, r as K, j as N, U as Q, z as V, A as W } from "./organizations.client-6fc91683.mjs";
+import { B as Y, _ as Z } from "./CardOrganization-18c1e3fa.mjs";
+import { a as tt } from "./Socials-3fe01af1.mjs";
+import { _ as rt } from "./Publics-f34131bf.mjs";
+import { o as it } from "./organizations-ea9de495.mjs";
+import { c as et } from "./IconEdit-c98d3d06.mjs";
 import "vue";
 import "vue-router";
 import "vue-i18n";
 import "./globals-96ba60e4.mjs";
-import "./Breadcrumbs.vue_vue_type_style_index_0_lang-19e23006.mjs";
-import "./index-0ab9d59c.mjs";
+import "./Breadcrumbs.vue_vue_type_style_index_0_lang-b1873cb7.mjs";
+import "./index-a661083c.mjs";
 import "./_plugin-vue_export-helper-dad06003.mjs";
 import "./Tab-a243605d.mjs";
 import "./inputs.validation-14e8e01f.mjs";
-import "./Feed-27f62b1c.mjs";
+import "./Button.vue_vue_type_style_index_0_lang-4ed993c7.mjs";
+import "./auth-98fe3efb.mjs";
+import "./ButtonFollow.vue_vue_type_style_index_0_scoped_0634d4a1_lang-4ed993c7.mjs";
+import "./Feed-ef6c6ca3.mjs";
 import "./EmptyState-34d85f10.mjs";
-import "./Chips-9cf6c0da.mjs";
-import "./IconEdit-eacf3856.mjs";
-import "./Button-d8e72ac0.mjs";
-import "./Feed-7c8c901a.mjs";
-import "./auth-b047fdc0.mjs";
-import "./Select.vue_vue_type_style_index_0_scoped_a78dbba1_lang-4ed993c7.mjs";
-import "./UploadImage-f7b0335f.mjs";
-import "./Select-90d4b7c8.mjs";
-import "./auth.validation-2cdd2231.mjs";
+import "./Chips-2ada5eda.mjs";
+import "./Feed-76fc4475.mjs";
+import "./Select-11ddabf5.mjs";
+import "./reports-79cd9459.mjs";
+import "./Button-c59d387c.mjs";
+import "./UploadImage-3c627d89.mjs";
+import "./auth.validation-e265b496.mjs";
+import "./click-outside-6101836c.mjs";
 export {
-  at as ButtonFollow,
-  W as CardOrganization,
-  O as Contacts,
-  y as Department,
-  A as DepartmentEdit,
-  E as DepartmentMemberModify,
-  P as DepartmentSection,
-  T as DepartmentSub,
-  U as DepartmentSubDepartmentModify,
-  _ as DetailsTab,
-  h as Documents,
-  v as EditArray,
-  w as EmptyState,
-  B as MembersAdd,
-  C as MembersList,
-  R as MembersTab,
-  j as Organization,
-  k as OrganizationEdit,
-  q as Organizations,
-  F as OrganizationsAccount,
-  L as OrganizationsSection,
-  G as Places,
-  $ as Publics,
-  H as Rating,
-  Y as Socials,
-  I as StructureTab,
-  J as Unit,
-  K as User,
-  N as invitesStore,
-  rt as membershipsStore,
+  Y as ButtonFollow,
+  Z as CardOrganization,
+  A as Contacts,
+  E as Department,
+  P as DepartmentEdit,
+  T as DepartmentMemberModify,
+  U as DepartmentSection,
+  h as DepartmentSub,
+  v as DepartmentSubDepartmentModify,
+  w as DetailsTab,
+  B as Documents,
+  C as EditArray,
+  R as EmptyState,
+  _ as MembersAdd,
+  j as MembersList,
+  k as MembersTab,
+  q as Organization,
+  F as OrganizationEdit,
+  L as Organizations,
+  G as OrganizationsAccount,
+  H as OrganizationsSection,
+  I as Places,
+  rt as Publics,
+  J as Rating,
+  tt as Socials,
+  K as StructureTab,
+  N as Unit,
+  Q as User,
+  V as invitesStore,
+  et as membershipsStore,
   it as organizationStore,
-  Q as organizationsRoutes
+  W as organizationsRoutes
 };

package/dist/organizations.server.js

@@ -6,6 +6,8 @@ require("bcryptjs");
 require("uuidv4");
 const require$$1 = require("mongoose");
 const require$$5 = require("@googlemaps/google-maps-services-js");
+const addMembersQuantity$1 = require("./addMembersQuantity-f922d82b.js");
+require("mongodb");
 const controllerFactory$5 = (db) => {
   const Department = db.department;
   const readOne = (req, res) => {
@@ -73,6 +75,8 @@ const jwt = require$$0;
 const ObjectId = require$$1.Types.ObjectId;
 const { Client } = require$$5;
 const client = new Client({});
+const addUserStatusFields = addMembersQuantity$1.addUserStatusFields_1;
+const addMembersQuantity = addMembersQuantity$1.addMembersQuantity_1;
 const controllerFactory$4 = (db) => {
   const Organization = db.organization;
   const Membership = db.membership;
@@ -200,24 +204,8 @@ const controllerFactory$4 = (db) => {
           as: "memberships"
         }
       },
-      {
-        $addFields: {
-          numberOfMemberships: { $size: "$memberships" }
-        }
-      },
-      {
-        $addFields: {
-          isMember: {
-            $cond: {
-              if: req.query.user,
-              then: {
-                $in: [new ObjectId(req.query.user), "$memberships.user"]
-              },
-              else: "$$REMOVE"
-            }
-          }
-        }
-      },
+      addMembersQuantity(),
+      addUserStatusFields(req.query.user),
       {
         $addFields: {
           numberOfProducts: { $size: "$products" }
@@ -234,9 +222,11 @@ const controllerFactory$4 = (db) => {
           rating: 1,
           socials: 1,
           numberOfProducts: 1,
-          numberOfMemberships: 1,
+          numberOfSubscribers: 1,
           memberships: 1,
           isMember: 1,
+          isSubscriber: 1,
+          isBlocked: 1,
           departments: 1
         }
       },
@@ -377,6 +367,7 @@ const controllerFactory$3 = (db) => {
     }
   };
   const create = async (req, res) => {
+    console.log(req.body);
     const newMembership = new Membership({
       user: req.body.user,
       type: req.body.type,
@@ -402,15 +393,16 @@ const controllerFactory$3 = (db) => {
     }
   };
   const deleteMembership = async (req, res) => {
-    const { type, target, user: user2 } = req.body;
+    const { type, target, user: user2, role } = req.body;
+    console.log(req.body);
     try {
-      const membership = await Membership.findOne({ type, target, user: user2 });
+      const membership = await Membership.findOne({ type, target, user: user2, role });
       if (!membership) {
         return res.status(404).send({ errorCode: "MEMBERSHIP_NOT_FOUND" });
+      } else {
+        await Membership.deleteOne({ _id: membership._id });
+        res.status(200).send(membership);
       }
-      console.log(membership);
-      await membership.remove();
-      res.status(200).send(membership);
     } catch (error) {
       console.log(error);
       res.status(500).send({ errorCode: "SERVER_ERROR" });
@@ -642,6 +634,10 @@ var membership_model = (mongoose) => {
       default: "organization",
       required: true
     },
+    role: {
+      type: String,
+      default: "subscriber"
+    },
     target: {
       // заменяем 'organization' на 'target', так как это может быть или User, или Organization
       type: mongoose.Schema.Types.ObjectId,
@@ -652,10 +648,6 @@ var membership_model = (mongoose) => {
           return "Organization";
       },
       required: true
-    },
-    role: {
-      type: String,
-      default: "subscriber"
     }
   });
   const Membership = mongoose.model("Membership", MembershipSchema);

package/dist/organizations.server.mjs

@@ -5,6 +5,8 @@ import "bcryptjs";
 import "uuidv4";
 import require$$1 from "mongoose";
 import require$$5 from "@googlemaps/google-maps-services-js";
+import { a as addUserStatusFields_1, b as addMembersQuantity_1 } from "./addMembersQuantity-ea216f92.mjs";
+import "mongodb";
 const controllerFactory$5 = (db) => {
   const Department = db.department;
   const readOne = (req, res) => {
@@ -72,6 +74,8 @@ const jwt = require$$0;
 const ObjectId = require$$1.Types.ObjectId;
 const { Client } = require$$5;
 const client = new Client({});
+const addUserStatusFields = addUserStatusFields_1;
+const addMembersQuantity = addMembersQuantity_1;
 const controllerFactory$4 = (db) => {
   const Organization = db.organization;
   const Membership = db.membership;
@@ -199,24 +203,8 @@ const controllerFactory$4 = (db) => {
           as: "memberships"
         }
       },
-      {
-        $addFields: {
-          numberOfMemberships: { $size: "$memberships" }
-        }
-      },
-      {
-        $addFields: {
-          isMember: {
-            $cond: {
-              if: req.query.user,
-              then: {
-                $in: [new ObjectId(req.query.user), "$memberships.user"]
-              },
-              else: "$$REMOVE"
-            }
-          }
-        }
-      },
+      addMembersQuantity(),
+      addUserStatusFields(req.query.user),
       {
         $addFields: {
           numberOfProducts: { $size: "$products" }
@@ -233,9 +221,11 @@ const controllerFactory$4 = (db) => {
           rating: 1,
           socials: 1,
           numberOfProducts: 1,
-          numberOfMemberships: 1,
+          numberOfSubscribers: 1,
           memberships: 1,
           isMember: 1,
+          isSubscriber: 1,
+          isBlocked: 1,
           departments: 1
         }
       },
@@ -376,6 +366,7 @@ const controllerFactory$3 = (db) => {
     }
   };
   const create = async (req, res) => {
+    console.log(req.body);
     const newMembership = new Membership({
       user: req.body.user,
       type: req.body.type,
@@ -401,15 +392,16 @@ const controllerFactory$3 = (db) => {
     }
   };
   const deleteMembership = async (req, res) => {
-    const { type, target, user: user2 } = req.body;
+    const { type, target, user: user2, role } = req.body;
+    console.log(req.body);
     try {
-      const membership = await Membership.findOne({ type, target, user: user2 });
+      const membership = await Membership.findOne({ type, target, user: user2, role });
       if (!membership) {
         return res.status(404).send({ errorCode: "MEMBERSHIP_NOT_FOUND" });
+      } else {
+        await Membership.deleteOne({ _id: membership._id });
+        res.status(200).send(membership);
       }
-      console.log(membership);
-      await membership.remove();
-      res.status(200).send(membership);
     } catch (error) {
       console.log(error);
       res.status(500).send({ errorCode: "SERVER_ERROR" });
@@ -641,6 +633,10 @@ var membership_model = (mongoose) => {
       default: "organization",
       required: true
     },
+    role: {
+      type: String,
+      default: "subscriber"
+    },
     target: {
       // заменяем 'organization' на 'target', так как это может быть или User, или Organization
       type: mongoose.Schema.Types.ObjectId,
@@ -651,10 +647,6 @@ var membership_model = (mongoose) => {
           return "Organization";
       },
       required: true
-    },
-    role: {
-      type: String,
-      default: "subscriber"
     }
   });
   const Membership = mongoose.model("Membership", MembershipSchema);