@ozdao/prometheus-framework 0.2.129 → 0.2.132

package/dist/_virtual/_commonjsHelpers.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});var o=typeof globalThis<"u"?globalThis:typeof window<"u"?window:typeof global<"u"?global:typeof self<"u"?self:{};function l(e){return e&&e.__esModule&&Object.prototype.hasOwnProperty.call(e,"default")?e.default:e}exports.commonjsGlobal=o;exports.getDefaultExportFromCjs=l;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});function e(t){return t&&t.__esModule&&Object.prototype.hasOwnProperty.call(t,"default")?t.default:t}exports.getDefaultExportFromCjs=e;

package/dist/_virtual/_commonjsHelpers.js

@@ -1,8 +1,6 @@
-var o = typeof globalThis < "u" ? globalThis : typeof window < "u" ? window : typeof global < "u" ? global : typeof self < "u" ? self : {};
-function l(e) {
-  return e && e.__esModule && Object.prototype.hasOwnProperty.call(e, "default") ? e.default : e;
+function e(t) {
+  return t && t.__esModule && Object.prototype.hasOwnProperty.call(t, "default") ? t.default : t;
 }
 export {
-  o as commonjsGlobal,
-  l as getDefaultExportFromCjs
+  e as getDefaultExportFromCjs
 };

package/dist/auth.server.js

@@ -237,7 +237,6 @@ const controllerFactory$3 = (db) => {
         }
         const rights = accesses[orgId].rights;
         const defaultAccesses = new Department();
-        console.log(defaultAccesses);
         const accessData = isOwner ? defaultAccesses.accesses : (depts.find((dept) => dept.organization.toString() === orgId) || {}).accesses;
         Object.keys(accessData).forEach((key) => {
           if (!rights[key]) {

package/dist/auth.server.mjs

@@ -236,7 +236,6 @@ const controllerFactory$3 = (db) => {
         }
         const rights = accesses[orgId].rights;
         const defaultAccesses = new Department();
-        console.log(defaultAccesses);
         const accessData = isOwner ? defaultAccesses.accesses : (depts.find((dept) => dept.organization.toString() === orgId) || {}).accesses;
         Object.keys(accessData).forEach((key) => {
           if (!rights[key]) {

package/dist/community.server.js

@@ -1,12 +1,12 @@
 "use strict";
 const _commonjsHelpers = require("./_commonjsHelpers-DHfMLFPC.js");
 const require$$0 = require("mongoose");
-const queryProcessor$3 = require("./queryProcessor-haY_gPGg.js");
+const queryProcessor$3 = require("./queryProcessor-iewDZq_f.js");
 require("util");
 require("uuid");
 const index = require("./index-BshfsiQG.js");
 const common_schema = require("./common.schema-BFhpUXUt.js");
-const engagement_schema = require("./engagement.schema-fdLNO2_6.js");
+const engagement_schema = require("./engagement.schema-D-9md46B.js");
 const ownership_schema = require("./ownership.schema-DN0SlQL6.js");
 const metadata_schema = require("./metadata.schema-6slGhpQS.js");
 function getPeriodConditions(period) {
@@ -237,8 +237,8 @@ const controllerFactory$3 = (db) => {
       // For owner
       queryProcessorGlobals.getOwnerUserLookupStage(),
       queryProcessorGlobals.getOwnerOrganizationLookupStage(),
-      queryProcessorGlobals.getAddFieldsCreatorOwnerStage(),
-      { $sample: { size: Number(req.query.limit) } }
+      queryProcessorGlobals.getAddFieldsCreatorOwnerStage()
+      // { $sample: { size: Number(req.query.limit) } },
     ];
     try {
       const posts = await Blogpost.aggregate(stages).exec();
@@ -302,46 +302,173 @@ const commentControllerFactory = (db) => {
   const Membership = db.membership;
   const read = async (req, res) => {
     try {
-      let conditions = { target: req.query.target };
-      if (req.query.user) {
-        const memberships = await Membership.find({ user: req.query.user });
-        const blockedMembers = memberships.filter((membership) => membership.role === "blocked").map((membership) => membership.target);
-        if (blockedMembers.length > 0) {
-          conditions.user = { "$nin": blockedMembers };
+      let buildCommentTree = function(comments2) {
+        const commentMap = /* @__PURE__ */ new Map();
+        const objectIdToString = (id) => id.toString();
+        function addToMap(comment) {
+          const commentId = objectIdToString(comment._id);
+          if (!commentMap.has(commentId)) {
+            commentMap.set(commentId, { ...comment, children: [] });
+            if (comment.children && comment.children.length > 0) {
+              comment.children.forEach(addToMap);
+            }
+          }
         }
+        comments2.forEach(addToMap);
+        commentMap.forEach((comment) => {
+          if (comment.parent) {
+            const parentId2 = objectIdToString(comment.parent);
+            const parent = commentMap.get(parentId2);
+            if (parent) {
+              parent.children.push(comment);
+            }
+          }
+        });
+        function sortChildren(comment) {
+          if (comment.children.length > 0) {
+            comment.children.sort((a, b) => new Date(a.createdAt) - new Date(b.createdAt));
+            comment.children.forEach(sortChildren);
+          }
+        }
+        const rootComments = comments2.map((comment) => {
+          const commentId = objectIdToString(comment._id);
+          return commentMap.get(commentId);
+        }).filter((comment) => !comment.parent);
+        rootComments.sort((a, b) => new Date(a.createdAt) - new Date(b.createdAt));
+        rootComments.forEach(sortChildren);
+        return rootComments;
+      };
+      const { target, type, user, maxDepth = 4, parentId = null } = req.query;
+      let conditions = {
+        target: new db.mongoose.Types.ObjectId(target),
+        type
+      };
+      if (parentId) {
+        conditions.parent = new db.mongoose.Types.ObjectId(parentId);
+      } else {
+        conditions.parent = null;
       }
-      const comments = await Comment.find(conditions).populate({
-        path: "user",
-        select: "username profile.photo profile.name _id"
-      });
-      if (!comments) {
-        return res.status(404).send({ message: "Comments not found." });
+      let blockedMembers = [];
+      if (user) {
+        const memberships = await Membership.find({ user, role: "blocked" });
+        blockedMembers = memberships.map((membership) => membership.target);
       }
-      const countedComments = comments.map((comment) => {
-        return {
-          ...comment._doc,
-          user: comment.user
-        };
-      });
-      res.status(200).send(countedComments);
-    } catch (err) {
-      res.status(500).send({ message: err.message });
+      const pipeline = [
+        { $match: conditions },
+        { $sort: { createdAt: 1 } },
+        {
+          $graphLookup: {
+            from: "comments",
+            startWith: "$_id",
+            connectFromField: "_id",
+            connectToField: "parent",
+            as: "children",
+            depthField: "childDepth"
+          }
+        },
+        {
+          $lookup: {
+            from: "users",
+            localField: "user",
+            foreignField: "_id",
+            as: "user"
+          }
+        },
+        { $unwind: "$user" },
+        {
+          $lookup: {
+            from: "users",
+            localField: "children.user",
+            foreignField: "_id",
+            as: "childUsers"
+          }
+        },
+        {
+          $project: {
+            _id: 1,
+            content: 1,
+            type: 1,
+            target: 1,
+            "user.username": 1,
+            "user.profile.photo": 1,
+            "user.profile.name": 1,
+            "user._id": 1,
+            depth: 1,
+            createdAt: 1,
+            childrenCount: { $size: "$children" },
+            children: {
+              $map: {
+                input: "$children",
+                as: "child",
+                in: {
+                  _id: "$$child._id",
+                  content: "$$child.content",
+                  type: "$$child.type",
+                  parent: "$$child.parent",
+                  target: "$$child.target",
+                  user: {
+                    $arrayElemAt: [
+                      {
+                        $filter: {
+                          input: "$childUsers",
+                          as: "childUser",
+                          cond: { $eq: ["$$childUser._id", "$$child.user"] }
+                        }
+                      },
+                      0
+                    ]
+                  },
+                  depth: "$$child.depth",
+                  createdAt: "$$child.createdAt",
+                  childrenCount: { $size: "$$child.children" }
+                }
+              }
+            }
+          }
+        }
+      ];
+      if (blockedMembers.length > 0) {
+        pipeline.unshift({ $match: { user: { $nin: blockedMembers } } });
+      }
+      const comments = await Comment.aggregate(pipeline);
+      commentsTree = buildCommentTree(comments);
+      console.log(commentsTree);
+      res.status(200).json(commentsTree);
+    } catch (error) {
+      console.error(error);
+      res.status(500).json({ message: error.message });
     }
   };
   const create = async (req, res) => {
     try {
+      const { user, type, target, content, parent } = req.body;
+      let depth = 0;
+      if (parent) {
+        const parentComment = await Comment.findById(parent);
+        if (!parentComment) {
+          return res.status(404).send({ message: "Parent comment not found." });
+        }
+        depth = parentComment.depth + 1;
+      }
       const comment = new Comment({
-        user: req.body.user,
-        type: req.body.type,
-        target: req.body.target,
-        content: req.body.content
+        user,
+        type,
+        target,
+        content,
+        parent,
+        depth
       });
-      const data = await comment.save();
-      const populatedComment = await Comment.findOne({ _id: data._id }).populate({
+      const savedComment = await comment.save();
+      if (parent) {
+        await Comment.findByIdAndUpdate(parent, {
+          $push: { children: savedComment._id }
+        });
+      }
+      const populatedComment = await Comment.findById(savedComment._id).populate({
         path: "user",
         select: "username profile.photo profile.name _id"
       });
-      res.status(200).send(populatedComment);
+      res.status(201).send(populatedComment);
     } catch (err) {
       console.error(err);
       res.status(500).send({
@@ -466,8 +593,7 @@ var reactions_controller = reactionControllerFactory;
 var verifyBlogpost;
 var hasRequiredVerifyBlogpost;
 function requireVerifyBlogpost() {
-  if (hasRequiredVerifyBlogpost)
-    return verifyBlogpost;
+  if (hasRequiredVerifyBlogpost) return verifyBlogpost;
   hasRequiredVerifyBlogpost = 1;
   const middlewareFactory = (db) => {
     const Blogpost = db.blogpost;
@@ -643,17 +769,26 @@ var comment_model = (mongoose) => {
       // заменяем 'organization' на 'target', так как это может быть или User, или Organization
       type: mongoose.Schema.Types.ObjectId,
       ref: function(value) {
-        if (this.type === "blogpost")
-          return "Blogpost";
-        if (this.type === "comment")
-          return "Comment";
-        if (this.type === "event")
-          return "Event";
-        if (this.type === "photo")
-          return "Photo";
+        if (this.type === "blogpost") return "Blogpost";
+        if (this.type === "comment") return "Comment";
+        if (this.type === "event") return "Event";
+        if (this.type === "photo") return "Photo";
       },
       required: true
     },
+    parent: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: "Comment",
+      default: null
+    },
+    children: [{
+      type: mongoose.Schema.Types.ObjectId,
+      ref: "Comment"
+    }],
+    depth: {
+      type: Number,
+      default: 0
+    },
     content: {
       type: String,
       required: true
@@ -663,6 +798,7 @@ var comment_model = (mongoose) => {
       default: Date.now
     }
   });
+  CommentSchema.index({ target: 1, parent: 1, depth: 1 });
   const Comment = mongoose.model("Comment", CommentSchema);
   return Comment;
 };
@@ -671,10 +807,8 @@ var reaction_model = (mongoose) => {
     user: {
       type: mongoose.Schema.Types.ObjectId,
       ref: function(value) {
-        if (this.owner.type === "user")
-          return "User";
-        if (this.owner.type === "organization")
-          return "Organization";
+        if (this.owner.type === "user") return "User";
+        if (this.owner.type === "organization") return "Organization";
       },
       required: true
     },
@@ -687,12 +821,9 @@ var reaction_model = (mongoose) => {
     target: {
       type: mongoose.Schema.Types.ObjectId,
       ref: function(value) {
-        if (this.owner.type === "event")
-          return "Event";
-        if (this.owner.type === "comment")
-          return "Comment";
-        if (this.owner.blogpost === "blogpost")
-          return "Blogpost";
+        if (this.owner.type === "event") return "Event";
+        if (this.owner.type === "comment") return "Comment";
+        if (this.owner.blogpost === "blogpost") return "Blogpost";
       }
     },
     targetString: {

package/dist/community.server.mjs

@@ -1,11 +1,11 @@
 import { g as getDefaultExportFromCjs } from "./_commonjsHelpers-CUmg6egw.mjs";
 import require$$0 from "mongoose";
-import { q as queryProcessor$3 } from "./queryProcessor-g8208K6g.mjs";
+import { q as queryProcessor$3 } from "./queryProcessor-DQSFR9YA.mjs";
 import "util";
 import "uuid";
 import { s as server$1 } from "./index-DKtnWDNC.mjs";
 import { c as common_schema } from "./common.schema-ChBVARrs.mjs";
-import { e as engagement_schema } from "./engagement.schema-CI2ifjXN.mjs";
+import { e as engagement_schema } from "./engagement.schema-CCdSLKd4.mjs";
 import { o as ownership_schema } from "./ownership.schema-oyx6eNkZ.mjs";
 import { m as metadata_schema } from "./metadata.schema-CK5e2O3f.mjs";
 function getPeriodConditions(period) {
@@ -236,8 +236,8 @@ const controllerFactory$3 = (db) => {
       // For owner
       queryProcessorGlobals.getOwnerUserLookupStage(),
       queryProcessorGlobals.getOwnerOrganizationLookupStage(),
-      queryProcessorGlobals.getAddFieldsCreatorOwnerStage(),
-      { $sample: { size: Number(req.query.limit) } }
+      queryProcessorGlobals.getAddFieldsCreatorOwnerStage()
+      // { $sample: { size: Number(req.query.limit) } },
     ];
     try {
       const posts = await Blogpost.aggregate(stages).exec();
@@ -301,46 +301,173 @@ const commentControllerFactory = (db) => {
   const Membership = db.membership;
   const read = async (req, res) => {
     try {
-      let conditions = { target: req.query.target };
-      if (req.query.user) {
-        const memberships = await Membership.find({ user: req.query.user });
-        const blockedMembers = memberships.filter((membership) => membership.role === "blocked").map((membership) => membership.target);
-        if (blockedMembers.length > 0) {
-          conditions.user = { "$nin": blockedMembers };
+      let buildCommentTree = function(comments2) {
+        const commentMap = /* @__PURE__ */ new Map();
+        const objectIdToString = (id) => id.toString();
+        function addToMap(comment) {
+          const commentId = objectIdToString(comment._id);
+          if (!commentMap.has(commentId)) {
+            commentMap.set(commentId, { ...comment, children: [] });
+            if (comment.children && comment.children.length > 0) {
+              comment.children.forEach(addToMap);
+            }
+          }
         }
+        comments2.forEach(addToMap);
+        commentMap.forEach((comment) => {
+          if (comment.parent) {
+            const parentId2 = objectIdToString(comment.parent);
+            const parent = commentMap.get(parentId2);
+            if (parent) {
+              parent.children.push(comment);
+            }
+          }
+        });
+        function sortChildren(comment) {
+          if (comment.children.length > 0) {
+            comment.children.sort((a, b) => new Date(a.createdAt) - new Date(b.createdAt));
+            comment.children.forEach(sortChildren);
+          }
+        }
+        const rootComments = comments2.map((comment) => {
+          const commentId = objectIdToString(comment._id);
+          return commentMap.get(commentId);
+        }).filter((comment) => !comment.parent);
+        rootComments.sort((a, b) => new Date(a.createdAt) - new Date(b.createdAt));
+        rootComments.forEach(sortChildren);
+        return rootComments;
+      };
+      const { target, type, user, maxDepth = 4, parentId = null } = req.query;
+      let conditions = {
+        target: new db.mongoose.Types.ObjectId(target),
+        type
+      };
+      if (parentId) {
+        conditions.parent = new db.mongoose.Types.ObjectId(parentId);
+      } else {
+        conditions.parent = null;
       }
-      const comments = await Comment.find(conditions).populate({
-        path: "user",
-        select: "username profile.photo profile.name _id"
-      });
-      if (!comments) {
-        return res.status(404).send({ message: "Comments not found." });
+      let blockedMembers = [];
+      if (user) {
+        const memberships = await Membership.find({ user, role: "blocked" });
+        blockedMembers = memberships.map((membership) => membership.target);
       }
-      const countedComments = comments.map((comment) => {
-        return {
-          ...comment._doc,
-          user: comment.user
-        };
-      });
-      res.status(200).send(countedComments);
-    } catch (err) {
-      res.status(500).send({ message: err.message });
+      const pipeline = [
+        { $match: conditions },
+        { $sort: { createdAt: 1 } },
+        {
+          $graphLookup: {
+            from: "comments",
+            startWith: "$_id",
+            connectFromField: "_id",
+            connectToField: "parent",
+            as: "children",
+            depthField: "childDepth"
+          }
+        },
+        {
+          $lookup: {
+            from: "users",
+            localField: "user",
+            foreignField: "_id",
+            as: "user"
+          }
+        },
+        { $unwind: "$user" },
+        {
+          $lookup: {
+            from: "users",
+            localField: "children.user",
+            foreignField: "_id",
+            as: "childUsers"
+          }
+        },
+        {
+          $project: {
+            _id: 1,
+            content: 1,
+            type: 1,
+            target: 1,
+            "user.username": 1,
+            "user.profile.photo": 1,
+            "user.profile.name": 1,
+            "user._id": 1,
+            depth: 1,
+            createdAt: 1,
+            childrenCount: { $size: "$children" },
+            children: {
+              $map: {
+                input: "$children",
+                as: "child",
+                in: {
+                  _id: "$$child._id",
+                  content: "$$child.content",
+                  type: "$$child.type",
+                  parent: "$$child.parent",
+                  target: "$$child.target",
+                  user: {
+                    $arrayElemAt: [
+                      {
+                        $filter: {
+                          input: "$childUsers",
+                          as: "childUser",
+                          cond: { $eq: ["$$childUser._id", "$$child.user"] }
+                        }
+                      },
+                      0
+                    ]
+                  },
+                  depth: "$$child.depth",
+                  createdAt: "$$child.createdAt",
+                  childrenCount: { $size: "$$child.children" }
+                }
+              }
+            }
+          }
+        }
+      ];
+      if (blockedMembers.length > 0) {
+        pipeline.unshift({ $match: { user: { $nin: blockedMembers } } });
+      }
+      const comments = await Comment.aggregate(pipeline);
+      commentsTree = buildCommentTree(comments);
+      console.log(commentsTree);
+      res.status(200).json(commentsTree);
+    } catch (error) {
+      console.error(error);
+      res.status(500).json({ message: error.message });
     }
   };
   const create = async (req, res) => {
     try {
+      const { user, type, target, content, parent } = req.body;
+      let depth = 0;
+      if (parent) {
+        const parentComment = await Comment.findById(parent);
+        if (!parentComment) {
+          return res.status(404).send({ message: "Parent comment not found." });
+        }
+        depth = parentComment.depth + 1;
+      }
       const comment = new Comment({
-        user: req.body.user,
-        type: req.body.type,
-        target: req.body.target,
-        content: req.body.content
+        user,
+        type,
+        target,
+        content,
+        parent,
+        depth
       });
-      const data = await comment.save();
-      const populatedComment = await Comment.findOne({ _id: data._id }).populate({
+      const savedComment = await comment.save();
+      if (parent) {
+        await Comment.findByIdAndUpdate(parent, {
+          $push: { children: savedComment._id }
+        });
+      }
+      const populatedComment = await Comment.findById(savedComment._id).populate({
         path: "user",
         select: "username profile.photo profile.name _id"
       });
-      res.status(200).send(populatedComment);
+      res.status(201).send(populatedComment);
     } catch (err) {
       console.error(err);
       res.status(500).send({
@@ -465,8 +592,7 @@ var reactions_controller = reactionControllerFactory;
 var verifyBlogpost;
 var hasRequiredVerifyBlogpost;
 function requireVerifyBlogpost() {
-  if (hasRequiredVerifyBlogpost)
-    return verifyBlogpost;
+  if (hasRequiredVerifyBlogpost) return verifyBlogpost;
   hasRequiredVerifyBlogpost = 1;
   const middlewareFactory = (db) => {
     const Blogpost = db.blogpost;
@@ -642,17 +768,26 @@ var comment_model = (mongoose) => {
       // заменяем 'organization' на 'target', так как это может быть или User, или Organization
       type: mongoose.Schema.Types.ObjectId,
       ref: function(value) {
-        if (this.type === "blogpost")
-          return "Blogpost";
-        if (this.type === "comment")
-          return "Comment";
-        if (this.type === "event")
-          return "Event";
-        if (this.type === "photo")
-          return "Photo";
+        if (this.type === "blogpost") return "Blogpost";
+        if (this.type === "comment") return "Comment";
+        if (this.type === "event") return "Event";
+        if (this.type === "photo") return "Photo";
       },
       required: true
     },
+    parent: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: "Comment",
+      default: null
+    },
+    children: [{
+      type: mongoose.Schema.Types.ObjectId,
+      ref: "Comment"
+    }],
+    depth: {
+      type: Number,
+      default: 0
+    },
     content: {
       type: String,
       required: true
@@ -662,6 +797,7 @@ var comment_model = (mongoose) => {
       default: Date.now
     }
   });
+  CommentSchema.index({ target: 1, parent: 1, depth: 1 });
   const Comment = mongoose.model("Comment", CommentSchema);
   return Comment;
 };
@@ -670,10 +806,8 @@ var reaction_model = (mongoose) => {
     user: {
       type: mongoose.Schema.Types.ObjectId,
       ref: function(value) {
-        if (this.owner.type === "user")
-          return "User";
-        if (this.owner.type === "organization")
-          return "Organization";
+        if (this.owner.type === "user") return "User";
+        if (this.owner.type === "organization") return "Organization";
       },
       required: true
     },
@@ -686,12 +820,9 @@ var reaction_model = (mongoose) => {
     target: {
       type: mongoose.Schema.Types.ObjectId,
       ref: function(value) {
-        if (this.owner.type === "event")
-          return "Event";
-        if (this.owner.type === "comment")
-          return "Comment";
-        if (this.owner.blogpost === "blogpost")
-          return "Blogpost";
+        if (this.owner.type === "event") return "Event";
+        if (this.owner.type === "comment") return "Comment";
+        if (this.owner.blogpost === "blogpost") return "Blogpost";
       }
     },
     targetString: {

package/dist/{engagement.schema-CI2ifjXN.mjs → engagement.schema-CCdSLKd4.mjs}

@@ -1,8 +1,7 @@
 var engagement_schema = function applyEngagementSchema(schema, db) {
   schema.add({ views: { type: Number, default: 0 } });
   schema.post("aggregate", async function(docs) {
-    if (docs.length === 0)
-      return;
+    if (docs.length === 0) return;
     console.log("Post-aggregate hook in engagement schema triggered");
     const model = this._model;
     if (!model) {

package/dist/{engagement.schema-fdLNO2_6.js → engagement.schema-D-9md46B.js}

@@ -2,8 +2,7 @@
 var engagement_schema = function applyEngagementSchema(schema, db) {
   schema.add({ views: { type: Number, default: 0 } });
   schema.post("aggregate", async function(docs) {
-    if (docs.length === 0)
-      return;
+    if (docs.length === 0) return;
     console.log("Post-aggregate hook in engagement schema triggered");
     const model = this._model;
     if (!model) {