@ozdao/prometheus-framework 0.2.39 → 0.2.41

package/src/modules/products/controllers/products.controller.js

@@ -167,77 +167,142 @@ const controllerFactory = (db) => {
 
   const getProducts = (req, res) => {
 
-    Product.aggregate([{
-      $lookup: {
-        from: "modifications",
-        let: { "productId": "$_id" },
-        pipeline: [{ 
-          $match: { 
-            "$expr": { 
-              "$eq": ["$product", "$$productId"] 
-            }
+    // {
+    //   $lookup: {
+    //     from: "modifications",
+    //     let: { "productId": "$_id" },
+    //     pipeline: [{ 
+    //       $match: { 
+    //         "$expr": { 
+    //           "$eq": ["$product", "$$productId"] 
+    //         }
+    //       }
+    //     },{
+    //       $lookup: {
+    //         from: "leftovers",
+    //         let: { "productId": "$_id" },
+    //         pipeline: [{
+    //           $unwind: "$positions"
+    //         },{ 
+    //           "$match": { "$expr": { "$eq": ["$positions._id", "$$productId"] }}
+    //         },{ 
+    //           "$project": {
+    //             _id: "$positions._id",
+    //             quantity: "$positions.quantity",
+    //             name: "$positions.name",
+    //           }
+    //         }],
+    //         as: "variantsMods"
+    //       },
+    //     },{ 
+    //       $set: { 
+    //         quantity:{
+    //           $sum:["$quantity",{$sum:"$variantsMods.quantity"}]
+    //         } 
+    //       }
+    //     },{ 
+    //       $unset: "variants" 
+    //     }],
+    //     as: "modifications"
+    //   },
+    // }
+
+    Product.aggregate([
+  {
+    $facet: {
+      "withIngredients": [
+        {
+          $match: {
+            ingridients: { $exists: true, $not: {$size: 0} } // Продукты с ингредиентами
           }
-        },{
+        },
+        {
+          $lookup: {
+            from: "products",
+            localField: "ingridients",
+            foreignField: "_id",
+            as: "ingredientDetails"
+          }
+        },
+        { $unwind: "$ingredientDetails" },
+        {
+          $lookup: {
+            from: "leftovers",
+            let: { "ingredientId": "$ingredientDetails._id" },
+            pipeline: [
+              { $unwind: "$positions" },
+              {
+                $match: {
+                  $expr: {
+                    $eq: ["$positions._id", "$$ingredientId"]
+                  }
+                }
+              },
+              {
+                $project: {
+                  quantity: "$positions.quantity"
+                }
+              }
+            ],
+            as: "ingredientLeftovers"
+          }
+        },
+        {
+          $group: {
+            _id: "$_id",
+            name: { $first: "$name" },
+            minQuantity: { $min: "$ingredientLeftovers.quantity" }
+          }
+        }
+      ],
+      "withoutIngredients": [
+        {
+          $match: {
+            $or: [
+              { ingridients: { $exists: false } }, // Продукты без ингредиентов
+              { ingridients: { $size: 0 } }
+            ]
+          }
+        },
+        {
           $lookup: {
             from: "leftovers",
             let: { "productId": "$_id" },
-            pipeline: [{
-              $unwind: "$positions"
-            },{ 
-              "$match": { "$expr": { "$eq": ["$positions._id", "$$productId"] }}
-            },{ 
-              "$project": {
-                _id: "$positions._id",
-                quantity: "$positions.quantity",
-                name: "$positions.name",
+            pipeline: [
+              { $unwind: "$positions" },
+              {
+                $match: {
+                  $expr: {
+                    $eq: ["$positions._id", "$$productId"]
+                  }
+                }
+              },
+              {
+                $project: {
+                  quantity: "$positions.quantity"
+                }
               }
-            }],
-            as: "variantsMods"
-          },
-        },{ 
-          $set: { 
-            quantity:{
-              $sum:["$quantity",{$sum:"$variantsMods.quantity"}]
-            } 
+            ],
+            as: "productLeftovers"
           }
-        },{ 
-          $unset: "variants" 
-        }],
-        as: "modifications"
-      },
-    },
-    {
-      $lookup: {
-        from: "leftovers",
-        let: { "productId": "$_id" },
-        pipeline: [
-          {
-           $unwind: "$positions"
-          },
-
-          { 
-            "$match": { "$expr": { "$eq": ["$positions._id", "$$productId"] }}
-          },
-          { 
-            "$project": {
-              _id: "$positions._id",
-              quantity: "$positions.quantity",
-              name: "$positions.name",
+        },
+        {
+          $set: {
+            minQuantity: { $sum: "$productLeftovers.quantity" }
           }
         }
-        ],
-        as: "variants"
-      }
-    },
-    { 
-      $set: { 
-        quantity:{
-          $sum:["$quantity",{$sum:"$variants.quantity"}]
-        } 
-      } 
-    },
-    { $unset: "variants" }
-    ])
+      ]
+    }
+  },
+  {
+    $project: {
+      products: { $setUnion: ["$withIngredients", "$withoutIngredients"] }
+    }
+  },
+  { $unwind: "$products" },
+  { $replaceRoot: { newRoot: "$products" } }
+])
+
     .exec((err, products) => {
       // If error
       if (err) {return res.status(500).send({ message: err }); }
@@ -338,58 +403,72 @@ const controllerFactory = (db) => {
   // Get product
   const getProduct = async (req, res) => {
     try {
-      const product = await  Product.aggregate([{ 
-        $match: { "_id" : new ObjectId(req.params._id) } 
-      },{
-        $lookup: {
-          from: "leftovers",
-          let: { "productId": "$_id" },
-          pipeline: [
-            {
-              $unwind: "$positions"
-            },
-            { 
-              "$match": { "$expr": { "$eq": ["$positions._id", "$$productId"] }}
-            },
-            { 
-              "$project": {
-                _id: "$positions._id",
-                quantity: "$positions.quantity",
-                name: "$positions.name",
-              // "quantity": "$$quantity"
+       const product = await Product.aggregate([
+        { 
+            $match: { "_id": new ObjectId(req.params._id) } 
+        },
+        {
+          $lookup: {
+            from: "leftovers",
+            let: { productId: "$_id", ingredients: { $ifNull: ["$ingredients", []] } },
+            pipeline: [
+              {
+                $unwind: "$positions"
+              },
+              { 
+                "$match": { "$expr": { "$eq": ["$positions._id", "$$productId"] }}
+              },
+              { 
+                "$addFields": {
+                  "positions.quantity": {
+                    $cond: {
+                      if: { $eq: ["$type", "stock-in"] },
+                      then: "$positions.quantity",
+                      else: { $multiply: ["$positions.quantity", -1] }
+                    }
+                  }
+                }
+              },
+              { 
+                "$project": {
+                  _id: "$positions._id",
+                  quantity: "$positions.quantity",
+                  name: "$positions.name",
+                }
               }
-            }
-          ],
-          as: "variants"
-        }
-      },{ 
-        $set: { 
-          quantity:{
-            $sum:["$quantity",{$sum:"$variants.quantity"}]
+            ],
+            as: "variants"
+          }
+        },
+        { 
+          $set: { 
+            quantity: {
+              $sum: ["$quantity", {$sum: "$variants.quantity"}]
+            } 
           } 
-        } 
-      },
-      { $unset: "variants" }
-    ])
+        },
 
-      if (!product || product.length < 1) {
-        return res.status(404).send({ message: "Product not found." });
-      }
+        { $unset: "variants" }
+    ]);
 
-      const updatedProduct = await Product.findOneAndUpdate(
-        { _id: req.params._id },
-        { $inc: { popularity: 1 } },
-        { new: true }
-      );
+    if (!product || product.length < 1) {
+      return res.status(404).send({ message: "Product not found." });
+    }
 
-      console.log('Popularity updated:', updatedProduct);
+    const updatedProduct = await Product.findOneAndUpdate(
+      { _id: req.params._id },
+      { $inc: { popularity: 1 } },
+      { new: true }
+    );
 
-     res.status(200).send(product);
-    } catch (err) {
-      console.error('Error:', err);
-      res.status(500).send({ message: err });
-    }
-  };
+    console.log('Popularity updated:', updatedProduct);
+
+   res.status(200).send(product);
+  } catch (err) {
+    console.error('Error:', err);
+    res.status(500).send({ message: err });
+  }
+};
   
   return {
     Create,

package/src/modules/products/models/product.model.js

@@ -18,6 +18,7 @@ module.exports = (mongoose) => {
         images:         {type: Array},
         popularity:     {type: Number}, 
         localization:   {type: Array},
+        ingredients: {type: Array},
         information:    [{
             name: {type: String}, 
             value: {type: String}

package/src/modules/spots/components/layouts/Spots.vue

@@ -4,13 +4,13 @@
 		<div class="h-100 w-100 flex-nowrap flex-column flex gap-thin pd-thin">
 
 					<!-- Sorting section -->
-					<div class="pd-medium bg-grey radius-big">
+					<div class="pd-medium bg-main radius-big">
 						<div class="flex-nowrap flex flex-v-center">
 							<header class="mn-r-auto flex-v-center t-left flex-nowrap flex">
 				      	<h2 class="t-left">
 				      		<span class="">Weed in </span>
 
-				      		<span @click="a => { globals.state.isOpenLocationPopup = true }" v-if="localPosition.city || localPosition.state || localPosition.country" class="t-semi t-main">
+				      		<span @click="a => { globals.state.isOpenLocationPopup = true }" v-if="localPosition.city || localPosition.state || localPosition.country" class="t-semi t-black">
 			      				<span v-if="localPosition.city">{{localPosition.city}}, </span>
 			      				<span v-if="localPosition.state">{{localPosition.state}}, </span>
 			      				<span v-if="localPosition.country">{{localPosition.country}}</span>

package/src/modules/wallet/components/pages/Wallet.vue

@@ -1,117 +1,102 @@
 <template>
-  <section class="pd-big">
-    <h1 class="mn-b-small">Your Wallet</h1>
+  <section class="pd-thin">
 
-    <p class="mn-b-semi p-big">
-      Earn Weeder Token Crypto with buying our weed, use it as money when buying our products or withdraw and trade
-    </p>
+    <section class="bg-black t-white mn-b-thin radius-big pd-big">
+      <h1 class="mn-b-medium ">Your Wallet</h1>
 
-    <div class="mn-b-semi cols-2 gap-thin">
-      <div
-        v-if="!state.account"
-        class="w-100 pd-medium radius-medium t-center bg-grey"
-      >
-        <h3 class="mn-b-small">Make first order and start earning Weeder Token</h3>
-        <button class="mn-l-auto mn-r-auto bg-main button">Explore marketplace</button>
-      </div>
+      <p class="mn-b-semi t-transp p-big">
+        Earn Weeder Tokens by purchasing our weed or contributing to the community.
+      </p>
 
-      <div
+      <div 
         v-if="state.account"
-        class="w-100 pd-medium radius-medium bg-grey"
+        class="gap-thin flex-nowrap bg-black radius-extra t-white br-solid br-white-transp-10 br-1px flex-v-center flex pd-medium"
       >
-        <p class="h4 mn-b-thin">You own:</p>
-        <h3 class="mn-b-small">{{state.share}}% of Weeder</h3>
-        <button class="w-100 bg-main button">Get More</button>
-      </div>
-
-      <div class="w-100 bg-black radius-semi pd-medium t-white">
-        <p class="h4 mn-b-thin">Your Metamask</p>
-
-        <div
-          v-if="state.account"
-          class="mn-b-small pd-small br-solid br-1px br-white-transp-10 radius-small"
-        >
-          {{state.account}}
+        <div class="flex-v-center flex-nowrap flex mn-r-auto">
+          <img src="/logo/wdt.svg" class="mn-r-thin i-big">
+          <h2>{{state.tokenBalance}} WDT</h2>
         </div>
 
-        <p
-          v-if="!state.account"
-          class="p-medium t-transp mn-b-small"
-        >
-          Connect Metamask to withdrawal your earnings.
-        </p>
-
-        <button
-          v-if="!state.account"
-          @click="actions.connectWallet"
-          class="w-100 br-solid br-2px br-white t-white button"
-        >
-          Connect Wallet
-        </button>
-
-        <button
-          v-if="state.account"
-          @click="actions.disconnectWallet"
-          class="w-100 bg-red button"
-        >
-          Disconnect Wallet
-        </button>
+        <button class="w-max bg-main t-medium button">Get More</button>
+        <button class="w-max bg-white t-black t-medium button" @click="actions.collectRewards">Withdraw</button>
       </div>
-    </div>
 
-     <div
-        v-if="state.account"
-        class="w-100 pd-medium radius-medium bg-grey"
-      >
-        <p class="h4 mn-b-thin">You earn:</p>
-        <h3 class="mn-b-small">{{state.tokenBalance}} WDT</h3>
-        <button class="w-100 bg-main button" @click="actions.collectRewards">Withdraw</button>
-      </div>
-
-
-    <h3 class="mn-b-small" v-if="state.rewards.length > 0">Latest Rewards </h3>
+    </section>
 
-    <section class="cols-3 gap-thin">
-      <div 
-        class="radius-medium bg-grey"
-        v-for="income in state.rewards"
-      > 
-        <!-- <pre>{{income}}</pre> -->
-        
-        <div class="pd-medium">
-           <span class="w-max mn-b-small d-block pd-t-nano pd-b-nano pd-l-thin pd-r-thin bg-main radius-extra t-semi p-small">{{income.type === 'blogpost' ? 'Community Reward' : income.type}}</span>
-          <h4 class="mn-b-thin">{{income.name}}</h4>
-          <p class="mn-b-small p-small">{{income.content[0].content}}</p>
+       <div v-if="!state.account" class="mn-b-semi cols-2 gap-thin">
+          <div
+            class="w-100 pd-medium radius-medium t-center bg-grey"
+          >
+            <h3 class="mn-b-small">Make first order and start earning Weeder Token</h3>
+            <button class="mn-l-auto mn-r-auto bg-main button">Explore marketplace</button>
+          </div>
 
-          <div class="bg-black t-white radius-extra pd-thin flex-center flex-nowrap flex">
-            <!-- <img src="/logo/wdt-plus.svg" class="mn-r-thin i-semi"> -->
-            <p class="t-semi">{{income.amount}} WDT</p>
+          <div
+            class="w-100 pd-medium flex-center flex flex-column radius-medium t-center bg-grey"
+          >
+            <h3 
+              v-if="!state.account"
+              class="mn-b-small"
+            >
+              Connect Metamask to withdrawal your earnings.
+            </h3>
+
+            <button
+              v-if="!state.account"
+              @click="actions.connectWallet"
+              class="br-solid br-2px br-black-transp-10 t-black button"
+            >
+              Connect Wallet
+            </button>
           </div>
         </div>
-        
-
-        <!-- <CardBlogpost 
-          :key="income._id" 
-          :blogpost="income" 
-          class=""
-        /> -->
 
-      </div>
+        <div
+          v-if="state.account"
+          class="w-100 mn-b-semi flex-column flex pd-big radius-big bg-main t-black"
+        >
+          <p class="t-transp t-medium mn-b-thin">You own:</p>
+          <p class="h1 mn-b-small">{{state.share}}%</p>
+          <p class="t-white p-big t-medium mn-b-semi">of all shares</p>
+
+            <div
+              class="flex-v-center mn-b-small flex-nowrap flex pd-small bg-black-transp-5 radius-extra"
+            >
+                <img src="@/assets/icons/metamask.svg" class="mn-r-small i-big" >
+              
+              <p v-if="state.account" class="t-transp t-medium ">
+                 <span class="uppercase p-small t-medium t-transp">Connected Metamask</span><br>
+                 <span>{{state.account}}</span>
+              </p>
+
+              <button
+                v-if="state.account"
+                @click="actions.disconnectWallet"
+                class="mn-l-auto bg-red button"
+              >
+                Disconnect Wallet
+              </button>
+            </div>
+
+         
+        </div>
+    <h2 class="mn-b-small" v-if="state.rewards.length > 0">Latest Rewards </h2>
 
+    <section class="cols-3 gap-thin">
       <div 
         class="radius-medium bg-grey"
         v-for="income in state.rewards"
       > 
-        <div class="flex-nowrap flex pd-medium">
-          <!-- <img src="/logo/wdt-plus.svg" class="mn-r-thin i-semi"> -->
+        <div class="flex-nowrap br-b br-black-transp-10 br-solid flex pd-medium">
+          <img src="/logo/wdt-plus.svg" class="mn-r-thin i-semi">
           <p class="t-semi mn-r-auto">{{income.amount}} WDT</p>
           
           <span class="pd-t-nano pd-b-nano pd-l-thin pd-r-thin bg-main flex flex-center radius-extra t-semi p-small">{{income.type === 'blogpost' ? 'Community Reward' : income.type}}</span>
         </div>
 
         <div class="pd-medium">
-          <h4 class="mn-b-thin">{{income.name}}</h4>
-          <p class="p-small">{{income.content[0].content}}</p>
+          <h4 class="t-regular mn-b-thin">{{income.name}}</h4>
+          <!-- <p class="p-small">{{income.content[0].content}}</p> -->
         </div>
 
       </div>

package/src/modules/wallet/controllers/crypto.controller.js

@@ -26,6 +26,85 @@ const cryptoControllerFactory = (db, wdmClient) => {
   const Comment = db.comment;
   const Reward = db.reward;
 
+  // const listRewards = async (req, res) => {
+  //   try {
+  //     const rewards = await Blogpost.aggregate([
+  //       // Шаг 1: Фильтрация блогпостов по создателю
+  //       { $match: { "creator.target": req.userId } },
+  //       // Шаг 2: Соединение с Reaction для подсчета реакций
+  //       {
+  //         $lookup: {
+  //           from: "reactions",
+  //           localField: "_id",
+  //           foreignField: "target",
+  //           as: "reactions"
+  //         }
+  //       },
+  //       // Шаг 3: Соединение с Comment для подсчета комментариев
+  //       {
+  //         $lookup: {
+  //           from: "comments",
+  //           localField: "_id",
+  //           foreignField: "target",
+  //           as: "comments"
+  //         }
+  //       },
+  //       // Шаг 4: Соединение с Reward для получения предыдущих наград
+  //       {
+  //         $lookup: {
+  //           from: "rewards",
+  //           let: { blogId: "$_id", userId: req.userId },
+  //           pipeline: [
+  //             { $match: { 
+  //                 $expr: { 
+  //                   $and: [
+  //                     { $eq: ["$user", "$$userId"] },
+  //                     { $eq: ["$type", "blogpost"] },
+  //                     { $eq: ["$target", "$$blogId"] }
+  //                   ] 
+  //                 } 
+  //               } 
+  //             },
+  //             { $sort: { createdAt: -1 } },
+  //             { $limit: 1 }
+  //           ],
+  //           as: "previousReward"
+  //         }
+  //       },
+  //       // Шаг 5: Проецирование результата и преобразование массивов в счетчики
+  //       {
+  //         $project: {
+  //           user: req.userId,
+  //           type: 'blogpost',
+  //           name: "$name",
+  //           content: "$content",
+  //           url: "$url",
+  //           views: "$views",
+  //           reactionsCount: { $size: "$reactions" },
+  //           commentsCount: { $size: "$comments" },
+  //           previousRewardSnapshot: { $arrayElemAt: ["$previousReward.snapshot", 0] },
+  //         }
+  //       }
+  //     ]).exec();
+
+  //     // Пересчет наград на основе полученных данных
+  //     const calculatedRewards = rewards.map(reward => ({
+  //       ...reward,
+  //       amount: calculateRewardForPost(
+  //         reward.previousRewardSnapshot,
+  //         reward.views,
+  //         reward.reactionsCount,
+  //         reward.commentsCount
+  //       ).toString(),
+  //     }));
+
+  //     res.status(200).send(calculatedRewards);
+  //   } catch (error) {
+  //     console.error("Error listing rewards:", error);
+  //     res.status(500).send({ message: "Internal server error" });
+  //   }
+  // };
+
   const listRewards = async (req, res) => {
     const blogs = await Blogpost.find({ "creator.target": req.userId }).exec();
 

package/src/modules/wallet/models/wallet.model.js

@@ -0,0 +1,27 @@
+module.exports = (mongoose) => {
+  const WalletSchema = new mongoose.Schema(
+    {
+      owner: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: () => {
+          if (this.owner.type === 'user') return 'User';
+          if (this.owner.type === 'organization') return 'Organization';
+        },
+        required: true,
+      },
+      amount: {
+        type: Number,
+        required: true,
+        default: 0
+      },
+    },
+    {
+      timestamps: {
+        currentTime: () => Date.now(),
+      },
+    },
+    { strict: false },
+  );
+
+  return mongoose.model("Wallet", WalletSchema);
+};

package/src/styles/base/all.scss

@@ -191,6 +191,10 @@ body {
     &-items-baseline 	{ align-items: baseline; } 
 	}
 
+	.align-self-start {
+		align-self: start;
+	}
+
 	.flex-child {	
 		&-noresize 		{ flex: 0 } 
 		&-grow-0 			{ flex-grow: 0; }