@ozdao/martyrs 0.2.564 → 0.2.566

package/dist/products.server.js

@@ -1,21 +1,20 @@
 import { C as CacheNamespaced } from "./core.cache-DALYFDdy.js";
-import { L as LoggerNamespaced } from "./core.logger-C3q8A9dl.js";
-import { q as queryProcessorCore } from "./queryProcessor-CBQgZycY.js";
+import { L as LoggerNamespaced, c as coreabac } from "./abac-BPl9Bmf9.js";
+import { q as queryProcessorCore } from "./queryProcessor-C_5Iipam.js";
 import OpenAI from "openai";
 import { Types } from "mongoose";
-import { a as applyCommonSchema } from "./common.schema-GFSlNJo7.js";
+import { a as applyCommonSchema } from "./common.schema-DswiUXKB.js";
 import { a as applyEngagementSchema } from "./engagement.schema-fh6W1fb_.js";
 import { a as applyMetadataSchema } from "./metadata.schema-CIRR_WQ-.js";
 import { a as applyOwnershipSchema } from "./ownership.schema-fwwDf_e5.js";
 import { m as middlewareFactory } from "./authJwt-J1csaMWA.js";
-import { c as coreabac } from "./core.abac-DUPBnlk6.js";
 import { a as Validator, V as Verifier } from "./core.verifier-gPPX_jhf.js";
-import { C as CRUD } from "./crud-C7FSTUes.js";
-import { A as ABAC } from "./abac-DYoheWuc.js";
+import { C as CRUD } from "./crud-q1ye5IhV.js";
 const controllerFactory$1 = (db) => {
   const Category = db.category;
   const logger = new LoggerNamespaced(db);
   const cache = new CacheNamespaced();
+  const abac = coreabac.getInstance(db);
   const generateSlug = async (name, parentId = null) => {
     const baseSlug = name.toLowerCase().replace(/[^a-z0-9\s-]/g, "").replace(/\s+/g, "-").replace(/-+/g, "-").trim("-");
     let slug = baseSlug;
@@ -137,13 +136,24 @@ const controllerFactory$1 = (db) => {
         const depthNum = parseInt(depth, 10);
         const isTree = tree === "true" || tree === true;
         const isRoot = root === "true" || root === true;
-        console.log("🚀 Read categories params:", { url, depth: depthNum, tree: isTree, root });
-        const cacheKey = JSON.stringify(req.query);
+        const cacheKey = JSON.stringify({ query: req.query, userId: req.userId });
         const cached = await cache.get(cacheKey);
         if (cached) return res.json(cached);
+        let canViewAllStatuses = false;
+        if (req.userId) {
+          const accessCheck = await abac.checkAccess({
+            user: req.userId,
+            resource: "category",
+            action: "read",
+            data: {
+              body: owner ? { owner: { type: "organization", target: owner } } : {}
+            }
+          });
+          canViewAllStatuses = accessCheck.allow;
+        }
         const match = {
           ..._id && { _id: new db.mongoose.Types.ObjectId(_id) },
-          ...status && { status },
+          ...status !== void 0 ? { status } : canViewAllStatuses ? {} : { status: "published" },
           ...search && { name: { $regex: search, $options: "i" } },
           ...type && { "owner.type": type },
           ...owner && { "owner.target": new db.mongoose.Types.ObjectId(owner) },
@@ -167,48 +177,39 @@ const controllerFactory$1 = (db) => {
         } else if (isRoot && !_id) {
           match.url = { $regex: "^/[^/]+$" };
         }
-        console.log("🔎 Match object:", JSON.stringify(match, null, 2));
         const pipeline = [
           { $match: match },
-          ...queryProcessorCore.getSortingOptions(sortParam, sortOrder)
-          // ...(skip || limit ? globalsQuery.getPaginationOptions(skip, limit) : []),
+          ...queryProcessorCore.getSortingOptions(sortParam, sortOrder),
+          ...!isTree && (skip || limit) ? queryProcessorCore.getPaginationOptions(skip, limit) : []
         ];
-        console.log("🔧 Pipeline:", JSON.stringify(pipeline, null, 2));
         let results = await Category.aggregate(pipeline);
-        console.log("🔍 Aggregate results:", results.length, "categories found");
-        console.log("🔍 Results URLs:", results.map((r) => r.url));
         if (url && depthNum > 1) {
           const maxLevel = url.split("/").filter(Boolean).length + depthNum - 1;
           results = results.filter((cat) => {
             const catLevel = cat.url.split("/").filter(Boolean).length;
             return cat.url === url || catLevel <= maxLevel;
           });
-          console.log("🔍 After depth filter:", results.length, "categories");
         }
         if (isTree && results.length > 0) {
-          console.log("🌳 Building tree from results");
           results = buildTreeFromUrl(results, sortParam, sortOrder);
+          const skipNum = parseInt(skip, 10) || 0;
+          const limitNum = parseInt(limit, 10) || 0;
+          if (limitNum > 0) {
+            results = results.slice(skipNum, skipNum + limitNum);
+          }
         } else if (!isTree && depthNum === 1 && url && results.length > 0) {
-          console.log("📋 Processing tree=false, depth=1");
-          console.log("📋 Looking for main category with url:", url);
           const mainCategory = results.find((c) => c.url === url);
-          console.log("📋 Main category found:", !!mainCategory, mainCategory?.url);
           if (mainCategory) {
             const children = results.filter(
               (c) => c.url !== url && c.url.startsWith(url + "/")
             );
-            console.log("📋 Children found:", children.length, children.map((c) => c.url));
             mainCategory.children = children;
             results = [mainCategory];
-            console.log("📋 Final result with children:", results[0].url, "children:", results[0].children.length);
-          } else {
-            console.log("❌ Main category not found in results!");
           }
         }
         const tags = ["categories"];
         if (owner) tags.push(`organization_${owner}`);
         await cache.setWithTags(cacheKey, results, tags);
-        console.log("✅ Final results count:", results.length);
         res.json(results);
       } catch (err) {
         logger.error(`Error reading categories: ${err.message}`);
@@ -1611,7 +1612,7 @@ const verifierFactory = (function(db) {
     deleteVerifier
   };
 });
-const { getInstance } = ABAC;
+const { getInstance } = coreabac;
 function setupVariantsRoutes(app, db) {
   const abac = getInstance(db);
   const verifier = verifierFactory();

package/dist/{queryProcessor-CBQgZycY.js → queryProcessor-C_5Iipam.js}

@@ -2,7 +2,7 @@ import { Types } from "mongoose";
 const ObjectId = { Types }.Types.ObjectId;
 function getBasicOptions(query) {
   console.log(query);
-  const { _id, url, status, notstatus, type, organization, owner, customer, creator, product } = query;
+  const { _id, url, status, notstatus, type, organization, owner, customer, creator, product, listing } = query;
   const stages = [];
   const conditions = [];
   if (_id) {
@@ -43,6 +43,9 @@ function getBasicOptions(query) {
   if (product) {
     conditions.push({ "product": new ObjectId(product) });
   }
+  if (listing) {
+    conditions.push({ listing });
+  }
   if (conditions.length > 0) {
     stages.push({ $match: { $and: conditions } });
   }

package/dist/rents.server.js

@@ -1,9 +1,8 @@
 import { m as middlewareIndexFactory } from "./index-_Edcmck_.js";
-import { c as coreabac } from "./core.abac-DUPBnlk6.js";
+import { L as LoggerNamespaced, c as coreabac } from "./abac-BPl9Bmf9.js";
 import { C as CacheNamespaced } from "./core.cache-DALYFDdy.js";
-import { L as LoggerNamespaced } from "./core.logger-C3q8A9dl.js";
 import { V as Verifier, a as Validator } from "./core.verifier-gPPX_jhf.js";
-import { q as queryProcessorCore } from "./queryProcessor-CBQgZycY.js";
+import { q as queryProcessorCore } from "./queryProcessor-C_5Iipam.js";
 const queryValidatorConfig = {
   // status: { rule: 'optional', validator: Validator.schema().string().oneOf(['published', 'pending']), default: 'pending' },
   owner: { rule: "optional", validator: Validator.schema().string(), default: null },

package/dist/spots.server.js

@@ -1,4 +1,4 @@
-import { q as queryProcessorCore } from "./queryProcessor-CBQgZycY.js";
+import { q as queryProcessorCore } from "./queryProcessor-C_5Iipam.js";
 const getIsOpenNowStage = (function getIsOpenNowStage2() {
   const now = /* @__PURE__ */ new Date();
   const currentDay = now.getDay();