@ozdao/prometheus-framework 0.1.33 → 0.1.34

package/dist/events.server.js

@@ -634,28 +634,44 @@ var tickets_routes = function(app, db, origins) {
   );
 };
 const tickets_routes$1 = /* @__PURE__ */ _commonjsHelpers.getDefaultExportFromCjs(tickets_routes);
-var common_schema = (mongoose) => {
-  const CommonSchema2 = new mongoose.Schema({
+var event_model = (mongoose) => {
+  const EventSchema = new mongoose.Schema({
+    url: {
+      type: String,
+      required: true
+    },
+    cover: {
+      type: String
+    },
+    name: {
+      type: String,
+      required: true
+    },
     status: {
       type: String,
       enum: ["draft", "published", "removed"],
       default: "draft",
       required: true
-    }
-  });
-  return CommonSchema2;
-};
-var engagement_schema = (db) => {
-  const EngagementSchema2 = new db.mongoose.Schema({
-    views: {
-      type: Number,
-      default: 0
-    }
-  });
-  return EngagementSchema2;
-};
-var ownership_schema = (mongoose) => {
-  const OwnershipSchema2 = new mongoose.Schema({
+    },
+    description: {
+      type: String,
+      required: true
+    },
+    content: {
+      type: Array
+    },
+    date: {
+      start: {
+        type: Date,
+        required: true
+      },
+      end: {
+        type: Date
+      }
+    },
+    tags: [{
+      type: String
+    }],
     owner: {
       type: {
         type: String,
@@ -663,7 +679,12 @@ var ownership_schema = (mongoose) => {
       },
       target: {
         type: mongoose.Schema.Types.ObjectId,
-        refPath: "owner.type",
+        ref: function(value) {
+          if (this.owner.type === "user")
+            return "User";
+          if (this.owner.type === "organization")
+            return "Organization";
+        },
         required: true
       }
     },
@@ -678,83 +699,22 @@ var ownership_schema = (mongoose) => {
       },
       target: {
         type: mongoose.Schema.Types.ObjectId,
-        refPath: "creator.type",
+        ref: function(value) {
+          if (this.owner.type === "user")
+            return "User";
+          if (this.owner.type === "organization")
+            return "Organization";
+        },
         required: true
       }
     }
-  });
-  return OwnershipSchema2;
-};
-var metadata_schema = (mongoose) => {
-  const MetadataSchema2 = new mongoose.Schema({
-    url: {
-      type: String,
-      required: true
-    },
-    tags: [{
-      type: String
-    }]
-  });
-  return MetadataSchema2;
-};
-const CommonSchema = common_schema;
-const EngagementSchema = engagement_schema;
-const OwnershipSchema = ownership_schema;
-const MetadataSchema = metadata_schema;
-var event_model = (db) => {
-  const EventSchema = new db.mongoose.Schema({
-    ...CommonSchema,
-    ...EngagementSchema,
-    ...OwnershipSchema,
-    ...MetadataSchema,
-    // views: { 
-    //   type: Number,
-    //   default: 0 
-    // },
-    cover: {
-      type: String
-    },
-    name: {
-      type: String,
-      required: true
-    },
-    description: {
-      type: String,
-      required: true
-    },
-    content: {
-      type: Array
-    },
-    date: {
-      start: {
-        type: Date,
-        required: true
-      },
-      end: {
-        type: Date
-      }
-    }
   }, {
     timestamps: {
       currentTime: () => Date.now()
     }
   });
   EventSchema.index({ "url": 1, "name": 1, "date.start": 1, "date.end": -1, "tags": 1, "owner.target": 1, "creator.target": 1 });
-  EventSchema.post("aggregate", async function(docs) {
-    console.log(EventSchema);
-    if (docs.length > 0) {
-      console.log("Post-aggregate hook triggered");
-      try {
-        await Promise.all(docs.map(async (doc) => {
-          console.log(doc._id);
-          const updatedViews = await db.event.findOneAndUpdate({ _id: doc._id }, { $inc: { views: 1 } }).exec();
-        }));
-      } catch (error) {
-        console.error("Error updating views:", error);
-      }
-    }
-  });
-  const Event = db.mongoose.model("Event", EventSchema);
+  const Event = mongoose.model("Event", EventSchema);
   return Event;
 };
 const event_model$1 = /* @__PURE__ */ _commonjsHelpers.getDefaultExportFromCjs(event_model);

package/dist/events.server.mjs

@@ -632,28 +632,44 @@ var tickets_routes = function(app, db, origins) {
   );
 };
 const tickets_routes$1 = /* @__PURE__ */ getDefaultExportFromCjs(tickets_routes);
-var common_schema = (mongoose) => {
-  const CommonSchema2 = new mongoose.Schema({
+var event_model = (mongoose) => {
+  const EventSchema = new mongoose.Schema({
+    url: {
+      type: String,
+      required: true
+    },
+    cover: {
+      type: String
+    },
+    name: {
+      type: String,
+      required: true
+    },
     status: {
       type: String,
       enum: ["draft", "published", "removed"],
       default: "draft",
       required: true
-    }
-  });
-  return CommonSchema2;
-};
-var engagement_schema = (db) => {
-  const EngagementSchema2 = new db.mongoose.Schema({
-    views: {
-      type: Number,
-      default: 0
-    }
-  });
-  return EngagementSchema2;
-};
-var ownership_schema = (mongoose) => {
-  const OwnershipSchema2 = new mongoose.Schema({
+    },
+    description: {
+      type: String,
+      required: true
+    },
+    content: {
+      type: Array
+    },
+    date: {
+      start: {
+        type: Date,
+        required: true
+      },
+      end: {
+        type: Date
+      }
+    },
+    tags: [{
+      type: String
+    }],
     owner: {
       type: {
         type: String,
@@ -661,7 +677,12 @@ var ownership_schema = (mongoose) => {
       },
       target: {
         type: mongoose.Schema.Types.ObjectId,
-        refPath: "owner.type",
+        ref: function(value) {
+          if (this.owner.type === "user")
+            return "User";
+          if (this.owner.type === "organization")
+            return "Organization";
+        },
         required: true
       }
     },
@@ -676,83 +697,22 @@ var ownership_schema = (mongoose) => {
       },
       target: {
         type: mongoose.Schema.Types.ObjectId,
-        refPath: "creator.type",
+        ref: function(value) {
+          if (this.owner.type === "user")
+            return "User";
+          if (this.owner.type === "organization")
+            return "Organization";
+        },
         required: true
       }
     }
-  });
-  return OwnershipSchema2;
-};
-var metadata_schema = (mongoose) => {
-  const MetadataSchema2 = new mongoose.Schema({
-    url: {
-      type: String,
-      required: true
-    },
-    tags: [{
-      type: String
-    }]
-  });
-  return MetadataSchema2;
-};
-const CommonSchema = common_schema;
-const EngagementSchema = engagement_schema;
-const OwnershipSchema = ownership_schema;
-const MetadataSchema = metadata_schema;
-var event_model = (db) => {
-  const EventSchema = new db.mongoose.Schema({
-    ...CommonSchema,
-    ...EngagementSchema,
-    ...OwnershipSchema,
-    ...MetadataSchema,
-    // views: { 
-    //   type: Number,
-    //   default: 0 
-    // },
-    cover: {
-      type: String
-    },
-    name: {
-      type: String,
-      required: true
-    },
-    description: {
-      type: String,
-      required: true
-    },
-    content: {
-      type: Array
-    },
-    date: {
-      start: {
-        type: Date,
-        required: true
-      },
-      end: {
-        type: Date
-      }
-    }
   }, {
     timestamps: {
       currentTime: () => Date.now()
     }
   });
   EventSchema.index({ "url": 1, "name": 1, "date.start": 1, "date.end": -1, "tags": 1, "owner.target": 1, "creator.target": 1 });
-  EventSchema.post("aggregate", async function(docs) {
-    console.log(EventSchema);
-    if (docs.length > 0) {
-      console.log("Post-aggregate hook triggered");
-      try {
-        await Promise.all(docs.map(async (doc) => {
-          console.log(doc._id);
-          const updatedViews = await db.event.findOneAndUpdate({ _id: doc._id }, { $inc: { views: 1 } }).exec();
-        }));
-      } catch (error) {
-        console.error("Error updating views:", error);
-      }
-    }
-  });
-  const Event = db.mongoose.model("Event", EventSchema);
+  const Event = mongoose.model("Event", EventSchema);
   return Event;
 };
 const event_model$1 = /* @__PURE__ */ getDefaultExportFromCjs(event_model);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ozdao/prometheus-framework",
-  "version": "0.1.33",
+  "version": "0.1.34",
   "description": "Web3 Framework focused on user experience and ease of development.",
   "author": "OZ DAO <hello@ozdao.dev>",
   "license": "GPL-3.0-or-later",

package/src/modules/events/models/event.model.js

@@ -1,19 +1,9 @@
-const CommonSchema = require('@pf/src/modules/globals/models/common.schema.js')
-const EngagementSchema = require('@pf/src/modules/globals/models/engagement.schema.js')
-const OwnershipSchema = require('@pf/src/modules/globals/models/ownership.schema.js')
-const MetadataSchema = require('@pf/src/modules/globals/models/metadata.schema.js')
-
-module.exports = (db) => {
-
-    const EventSchema = new db.mongoose.Schema({
-        ...CommonSchema,
-        ...EngagementSchema,
-        ...OwnershipSchema,
-        ...MetadataSchema,
-        // views: { 
-        //   type: Number,
-        //   default: 0 
-        // },
+module.exports = (mongoose) => {
+    const EventSchema = new mongoose.Schema({
+        url: { 
+            type: String, 
+            required: true 
+        },
         cover: { 
             type: String, 
         },
@@ -21,11 +11,16 @@ module.exports = (db) => {
             type: String, 
             required: true 
         },
+        status: {
+            type: String,
+            enum: ['draft','published','removed'], 
+            default: 'draft',
+            required: true,
+        },
         description: { 
             type: String, 
             required: true 
         },
-        
         content: { 
             type: Array 
         },
@@ -38,6 +33,41 @@ module.exports = (db) => {
                 type: Date, 
             }
         },
+        tags: [{ 
+            type: String 
+        }],
+        owner: {
+            type: {
+                type: String,
+                required: true
+            },
+            target: {
+                type: mongoose.Schema.Types.ObjectId,
+                ref: function (value) {
+                    if (this.owner.type === 'user') return 'User';
+                    if (this.owner.type === 'organization') return 'Organization';
+                },
+                required: true,
+            },
+        },
+        creator: {
+            hidden: {
+                type: Boolean,
+                required: true
+            },
+            type: {
+                type: String,
+                required: true
+            },
+            target: {
+                type: mongoose.Schema.Types.ObjectId,
+                ref: function (value) {
+                    if (this.owner.type === 'user') return 'User';
+                    if (this.owner.type === 'organization') return 'Organization';
+                },
+                required: true,
+            },
+        }
     }, {
         timestamps: { 
             currentTime: () => Date.now() 
@@ -46,31 +76,7 @@ module.exports = (db) => {
 
     EventSchema.index({ 'url': 1, 'name': 1, 'date.start': 1, 'date.end': -1, 'tags': 1, 'owner.target': 1, 'creator.target': 1 });
 
-    EventSchema.post('aggregate', async function(docs) {
-
-    console.log(EventSchema)
-
-        // Проверяем, возвращены ли какие-либо документы
-        if (docs.length > 0) {
-            console.log('Post-aggregate hook triggered');
-            // console.log(docs)
-            try {
-                // Так как мы не можем использовать `this` для обновления внутри агрегации, 
-                // мы должны выполнить обновление вручную для каждого соответствующего документа.
-                await Promise.all(docs.map(async (doc) => {
-                    // Предполагается, что у каждого документа есть уникальный идентификатор '_id'
-                    console.log(doc._id)
-                    const updatedViews = await db.event.findOneAndUpdate({ _id: doc._id }, { $inc: { views: 1 } }).exec();
-                    // console.log(updatedViews)
-                }));
-            } catch (error) {
-                console.error("Error updating views:", error);
-            }
-        }
-    });
-
-    const Event = db.mongoose.model("Event", EventSchema);
+    const Event = mongoose.model("Event", EventSchema);
 
     return Event;
-};
-
+};

package/src/modules/events/models/event.new.model.js

@@ -1,9 +1,19 @@
-module.exports = (mongoose) => {
-    const EventSchema = new mongoose.Schema({
-        url: { 
-            type: String, 
-            required: true 
-        },
+const CommonSchema = require('@pf/src/modules/globals/models/common.schema.js')
+const EngagementSchema = require('@pf/src/modules/globals/models/engagement.schema.js')
+const OwnershipSchema = require('@pf/src/modules/globals/models/ownership.schema.js')
+const MetadataSchema = require('@pf/src/modules/globals/models/metadata.schema.js')
+
+module.exports = (db) => {
+
+    const EventSchema = new db.mongoose.Schema({
+        ...CommonSchema,
+        ...EngagementSchema,
+        ...OwnershipSchema,
+        ...MetadataSchema,
+        // views: { 
+        //   type: Number,
+        //   default: 0 
+        // },
         cover: { 
             type: String, 
         },
@@ -11,16 +21,11 @@ module.exports = (mongoose) => {
             type: String, 
             required: true 
         },
-        status: {
-            type: String,
-            enum: ['draft','published','removed'], 
-            default: 'draft',
-            required: true,
-        },
         description: { 
             type: String, 
             required: true 
         },
+        
         content: { 
             type: Array 
         },
@@ -33,41 +38,6 @@ module.exports = (mongoose) => {
                 type: Date, 
             }
         },
-        tags: [{ 
-            type: String 
-        }],
-        owner: {
-            type: {
-                type: String,
-                required: true
-            },
-            target: {
-                type: mongoose.Schema.Types.ObjectId,
-                ref: function (value) {
-                    if (this.owner.type === 'user') return 'User';
-                    if (this.owner.type === 'organization') return 'Organization';
-                },
-                required: true,
-            },
-        },
-        creator: {
-            hidden: {
-                type: Boolean,
-                required: true
-            },
-            type: {
-                type: String,
-                required: true
-            },
-            target: {
-                type: mongoose.Schema.Types.ObjectId,
-                ref: function (value) {
-                    if (this.owner.type === 'user') return 'User';
-                    if (this.owner.type === 'organization') return 'Organization';
-                },
-                required: true,
-            },
-        }
     }, {
         timestamps: { 
             currentTime: () => Date.now() 
@@ -76,7 +46,31 @@ module.exports = (mongoose) => {
 
     EventSchema.index({ 'url': 1, 'name': 1, 'date.start': 1, 'date.end': -1, 'tags': 1, 'owner.target': 1, 'creator.target': 1 });
 
-    const Event = mongoose.model("Event", EventSchema);
+    EventSchema.post('aggregate', async function(docs) {
+
+    console.log(EventSchema)
+
+        // Проверяем, возвращены ли какие-либо документы
+        if (docs.length > 0) {
+            console.log('Post-aggregate hook triggered');
+            // console.log(docs)
+            try {
+                // Так как мы не можем использовать `this` для обновления внутри агрегации, 
+                // мы должны выполнить обновление вручную для каждого соответствующего документа.
+                await Promise.all(docs.map(async (doc) => {
+                    // Предполагается, что у каждого документа есть уникальный идентификатор '_id'
+                    console.log(doc._id)
+                    const updatedViews = await db.event.findOneAndUpdate({ _id: doc._id }, { $inc: { views: 1 } }).exec();
+                    // console.log(updatedViews)
+                }));
+            } catch (error) {
+                console.error("Error updating views:", error);
+            }
+        }
+    });
+
+    const Event = db.mongoose.model("Event", EventSchema);
 
     return Event;
-};
+};
+