@ozdao/prometheus-framework 0.2.112 → 0.2.114

package/dist/gallery.server.js

@@ -1,53 +1,75 @@
 "use strict";
 const _commonjsHelpers = require("./_commonjsHelpers-DHfMLFPC.js");
 const require$$0 = require("path");
+const queryProcessor = require("./queryProcessor-DWf9tsis.js");
 const index = require("./index-BCCiEK_u.js");
+const common_schema = require("./common.schema-BFhpUXUt.js");
+const engagement_schema = require("./engagement.schema-fdLNO2_6.js");
+const ownership_schema = require("./ownership.schema-DN0SlQL6.js");
 const path = require$$0;
+const queryProcessorGlobals = queryProcessor.queryProcessor;
 const controllerFactory$1 = (db) => {
   const Photo = db.photo;
   const read = async (req, res) => {
-    const { page, limit } = req.query;
-    console.log(req.query);
-    console.log(req.body);
-    let query = Photo.find().sort({ $natural: -1 });
-    if (page) {
-      const skipValue = (parseInt(page) - 1) * (limit ? parseInt(limit) : 10);
-      query = query.skip(skipValue);
-    }
-    if (limit) {
-      query = query.limit(parseInt(limit));
-    }
+    let stages = [
+      ...queryProcessorGlobals.getBasicOptions(
+        req.query
+      ),
+      // For creator
+      queryProcessorGlobals.getCreatorUserLookupStage(),
+      queryProcessorGlobals.getCreatorOrganizationLookupStage(),
+      queryProcessorGlobals.getCreatorCustomerLookupStage(),
+      // For owner
+      queryProcessorGlobals.getOwnerUserLookupStage(),
+      queryProcessorGlobals.getOwnerOrganizationLookupStage(),
+      queryProcessorGlobals.getAddFieldsCreatorOwnerStage(),
+      queryProcessorGlobals.removeTempPropeties(),
+      // Pagination
+      ...queryProcessorGlobals.getSortingOptions(
+        req.query.sortParam,
+        req.query.sortOrder
+      ),
+      ...queryProcessorGlobals.getPaginationOptions(
+        req.query.skip,
+        req.query.limit
+      )
+    ];
     try {
-      const photos = await query;
-      if (!photos.length) {
-        return res.status(404).send({ message: "Photos not found." });
+      const photos = await Photo.aggregate(stages);
+      console.log(photos);
+      if (!photos) {
+        return res.status(404).send({ errorCode: "PHOTOS_NOT_FOUND", message: "Photos not found." });
       }
       res.status(200).send(photos);
     } catch (err) {
-      res.status(500).send({ message: err.message || "An error occurred." });
+      console.log(err);
+      res.status(500).send({ errorCode: "GET_PHOTOS_FAILED", message: "Error occurred while fetching photos.", error: err });
     }
   };
   const create = async (req, res) => {
     try {
-      const { categories, size, images } = req.body;
-      if (!categories || !size || !images || images.length === 0) {
+      const { tags, creator, owner, images } = req.body;
+      if (!creator || !owner || !images || images.length === 0) {
         return res.status(400).send({ message: "All fields are required." });
       }
       const photos = [];
-      for (let imageLink of images) {
-        const filename = path.basename(imageLink);
+      for (let image of images) {
+        const filename = path.basename(image);
+        const directory = path.dirname(image);
         const newPhoto = {
-          categories,
-          size,
-          image: filename,
-          // Теперь сохраняется только имя файла
-          cover: "thumbnail_" + filename
-          // Путь для тумбнейла теперь использует только имя файла
+          tags,
+          creator,
+          owner,
+          image,
+          cover: path.join(directory, "thumbnail_" + filename)
+          // создаем путь для миниатюры
         };
-        const photo = await Photo.create(newPhoto);
+        let photo = await Photo.create(newPhoto);
         if (!photo) {
-          return res.status(404).send({ message: `Photo with link ${imageLink} is not created.` });
+          return res.status(404).send({ message: `Photo with link ${image} is not created.` });
         }
+        photo = await Photo.findOne({ _id: photo._id }).populate("creator.target").populate("owner.target");
+        console.log(photo);
         photos.push(photo);
       }
       res.status(200).send(photos);
@@ -91,7 +113,7 @@ var gallery_routes = function(app, db, origins) {
   const controller = controllerFactory(db);
   const { authJwt } = middlewareFactoryGlobal(db);
   app.get(
-    "/api/gallery",
+    "/api/gallery/read",
     controller.read
   );
   app.post(
@@ -99,29 +121,29 @@ var gallery_routes = function(app, db, origins) {
     [authJwt.verifyToken],
     controller.create
   );
-  app.post(
+  app.put(
     "/api/gallery/update",
     [authJwt.verifyToken],
     controller.update
   );
-  app.post(
+  app.delete(
     "/api/gallery/delete/:_id",
     [authJwt.verifyToken],
     controller.delete
   );
 };
-var photo_model = (mongoose) => {
-  const Photochema = new mongoose.Schema({
-    categories: {
-      type: [String]
-    },
-    size: {
-      type: Object
-    },
+const applyCommonSchema = common_schema.common_schema;
+const applyEngagementSchema = engagement_schema.engagement_schema;
+const applyOwnershipSchema = ownership_schema.ownership_schema;
+var photo_model = (db) => {
+  const PhotoSchema = new db.mongoose.Schema({
     cover: {
       type: String,
       required: true
     },
+    tags: {
+      type: Array
+    },
     image: {
       type: String,
       required: true
@@ -131,7 +153,12 @@ var photo_model = (mongoose) => {
       currentTime: () => Date.now()
     }
   });
-  const Photo = mongoose.model("Photo", Photochema);
+  applyCommonSchema(PhotoSchema);
+  applyEngagementSchema(PhotoSchema);
+  applyOwnershipSchema(PhotoSchema, db);
+  const Photo = db.mongoose.model("Photo", PhotoSchema);
+  Photo.collection.dropIndexes(function(err, results) {
+  });
   return Photo;
 };
 const galleryController = gallery_controller;

package/dist/gallery.server.mjs

@@ -1,52 +1,74 @@
 import { g as getDefaultExportFromCjs } from "./_commonjsHelpers-CUmg6egw.mjs";
 import require$$0 from "path";
+import { q as queryProcessor } from "./queryProcessor-BJoJAetd.mjs";
 import { s as server } from "./index-B6a1mPgp.mjs";
+import { c as common_schema } from "./common.schema-ChBVARrs.mjs";
+import { e as engagement_schema } from "./engagement.schema-CI2ifjXN.mjs";
+import { o as ownership_schema } from "./ownership.schema-oyx6eNkZ.mjs";
 const path = require$$0;
+const queryProcessorGlobals = queryProcessor;
 const controllerFactory$1 = (db) => {
   const Photo = db.photo;
   const read = async (req, res) => {
-    const { page, limit } = req.query;
-    console.log(req.query);
-    console.log(req.body);
-    let query = Photo.find().sort({ $natural: -1 });
-    if (page) {
-      const skipValue = (parseInt(page) - 1) * (limit ? parseInt(limit) : 10);
-      query = query.skip(skipValue);
-    }
-    if (limit) {
-      query = query.limit(parseInt(limit));
-    }
+    let stages = [
+      ...queryProcessorGlobals.getBasicOptions(
+        req.query
+      ),
+      // For creator
+      queryProcessorGlobals.getCreatorUserLookupStage(),
+      queryProcessorGlobals.getCreatorOrganizationLookupStage(),
+      queryProcessorGlobals.getCreatorCustomerLookupStage(),
+      // For owner
+      queryProcessorGlobals.getOwnerUserLookupStage(),
+      queryProcessorGlobals.getOwnerOrganizationLookupStage(),
+      queryProcessorGlobals.getAddFieldsCreatorOwnerStage(),
+      queryProcessorGlobals.removeTempPropeties(),
+      // Pagination
+      ...queryProcessorGlobals.getSortingOptions(
+        req.query.sortParam,
+        req.query.sortOrder
+      ),
+      ...queryProcessorGlobals.getPaginationOptions(
+        req.query.skip,
+        req.query.limit
+      )
+    ];
     try {
-      const photos = await query;
-      if (!photos.length) {
-        return res.status(404).send({ message: "Photos not found." });
+      const photos = await Photo.aggregate(stages);
+      console.log(photos);
+      if (!photos) {
+        return res.status(404).send({ errorCode: "PHOTOS_NOT_FOUND", message: "Photos not found." });
       }
       res.status(200).send(photos);
     } catch (err) {
-      res.status(500).send({ message: err.message || "An error occurred." });
+      console.log(err);
+      res.status(500).send({ errorCode: "GET_PHOTOS_FAILED", message: "Error occurred while fetching photos.", error: err });
     }
   };
   const create = async (req, res) => {
     try {
-      const { categories, size, images } = req.body;
-      if (!categories || !size || !images || images.length === 0) {
+      const { tags, creator, owner, images } = req.body;
+      if (!creator || !owner || !images || images.length === 0) {
         return res.status(400).send({ message: "All fields are required." });
       }
       const photos = [];
-      for (let imageLink of images) {
-        const filename = path.basename(imageLink);
+      for (let image of images) {
+        const filename = path.basename(image);
+        const directory = path.dirname(image);
         const newPhoto = {
-          categories,
-          size,
-          image: filename,
-          // Теперь сохраняется только имя файла
-          cover: "thumbnail_" + filename
-          // Путь для тумбнейла теперь использует только имя файла
+          tags,
+          creator,
+          owner,
+          image,
+          cover: path.join(directory, "thumbnail_" + filename)
+          // создаем путь для миниатюры
         };
-        const photo = await Photo.create(newPhoto);
+        let photo = await Photo.create(newPhoto);
         if (!photo) {
-          return res.status(404).send({ message: `Photo with link ${imageLink} is not created.` });
+          return res.status(404).send({ message: `Photo with link ${image} is not created.` });
         }
+        photo = await Photo.findOne({ _id: photo._id }).populate("creator.target").populate("owner.target");
+        console.log(photo);
         photos.push(photo);
       }
       res.status(200).send(photos);
@@ -90,7 +112,7 @@ var gallery_routes = function(app, db, origins) {
   const controller = controllerFactory(db);
   const { authJwt } = middlewareFactoryGlobal(db);
   app.get(
-    "/api/gallery",
+    "/api/gallery/read",
     controller.read
   );
   app.post(
@@ -98,29 +120,29 @@ var gallery_routes = function(app, db, origins) {
     [authJwt.verifyToken],
     controller.create
   );
-  app.post(
+  app.put(
     "/api/gallery/update",
     [authJwt.verifyToken],
     controller.update
   );
-  app.post(
+  app.delete(
     "/api/gallery/delete/:_id",
     [authJwt.verifyToken],
     controller.delete
   );
 };
-var photo_model = (mongoose) => {
-  const Photochema = new mongoose.Schema({
-    categories: {
-      type: [String]
-    },
-    size: {
-      type: Object
-    },
+const applyCommonSchema = common_schema;
+const applyEngagementSchema = engagement_schema;
+const applyOwnershipSchema = ownership_schema;
+var photo_model = (db) => {
+  const PhotoSchema = new db.mongoose.Schema({
     cover: {
       type: String,
       required: true
     },
+    tags: {
+      type: Array
+    },
     image: {
       type: String,
       required: true
@@ -130,7 +152,12 @@ var photo_model = (mongoose) => {
       currentTime: () => Date.now()
     }
   });
-  const Photo = mongoose.model("Photo", Photochema);
+  applyCommonSchema(PhotoSchema);
+  applyEngagementSchema(PhotoSchema);
+  applyOwnershipSchema(PhotoSchema, db);
+  const Photo = db.mongoose.model("Photo", PhotoSchema);
+  Photo.collection.dropIndexes(function(err, results) {
+  });
   return Photo;
 };
 const galleryController = gallery_controller;