cry-klikvet-logic 0.10.357 → 0.10.359

package/dist/q-isciPoRacunih.mjs

@@ -0,0 +1,153 @@
+import assert from 'assert';
+import { Log } from 'cry-helpers';
+import { performance } from 'perf_hooks';
+import { Repo } from 'cry-db';
+let log = new Log(['KLIKVET', 'KLIKVET-RACUNI']);
+/**
+ * Sestavi aggregation pipeline za iskanje po računih
+ * @param {Object} parametri iskanja
+ */
+function createAggregationPipeline({ odDne, doDne, stevilka, pripis, izdal, stranka, pacient, mpc, artikel, kategorije, skupineIzdelkov, skupineStrank, limit = 1000, }) {
+    let pipeline = [];
+    const allTimeCriteria = [
+        { datum: { $gte: odDne, $lt: doDne } },
+    ];
+    // compose timeline now
+    pipeline.push({ $match: { $and: allTimeCriteria } });
+    let where = {};
+    if (izdal)
+        where.izdal = { $in: toArray(izdal) };
+    if (mpc && typeof mpc == "number")
+        where.$expr = { $eq: [{ $round: ['$mpc', 2] }, { $round: [Number(mpc), 2] }] };
+    if (mpc && typeof mpc == "object")
+        where.$expr = mpc;
+    if (pripis)
+        where.pripis = new RegExp(prepareForRegex(pripis), 'gi');
+    if (stevilka)
+        where.stevilka = new RegExp(stevilka, 'gi');
+    if (pacient)
+        where.pacientIme = new RegExp(pacient, 'gi');
+    if (kategorije && kategorije.length)
+        where['postavke.kategorija'] = { $in: toArray(kategorije) };
+    if (artikel)
+        where['postavke.opis'] = new RegExp(prepareForRegex(artikel), 'gi');
+    if (Object.keys(where).length > 0)
+        pipeline.push({ $match: where });
+    if (stranka) {
+        let q = prepareForRegex(stranka);
+        pipeline.push({ $set: { q: { $filter: { input: ['$stranka.ime', '$stranka.priimek', '$stranka.firma', '$stranka.ulica', '$stranka.naselje', '$stranka.kraj', '$stranka.drzava'], as: 'x', cond: { $ne: ['$$x', null] } } } } });
+        pipeline.push({ $set: { q: { $reduce: { input: '$q', initialValue: '', in: { $concat: ['$$value', ' ', '$$this'] } } } } });
+        pipeline.push({ $match: { q: new RegExp(q, "gi") } });
+    }
+    if (skupineIzdelkov?.length) {
+        pipeline.push({ $lookup: {
+                from: 'artikli',
+                localField: 'postavke.artikel_id',
+                foreignField: '_id',
+                as: 'izdelek'
+            } });
+        pipeline.push({ $match: { 'izdelek.skupine': { $in: skupineIzdelkov } } });
+    }
+    if (skupineStrank && skupineStrank.length) {
+        pipeline.push({ $lookup: {
+                from: 'stranke',
+                localField: 'stranka._id',
+                foreignField: '_id',
+                as: 'stranka'
+            } });
+        pipeline.push({ $match: { 'stranka.skupine': { $in: skupineStrank } } });
+    }
+    //pipeline.push( { $project: { leto:1, mesec:1, izdal:1, mpc:1, ime:1, priimek:1,firma:1,ulica:1,kraj:1,naselje:1,pripis:1 ,postavke:1}})
+    pipeline.push({ $sort: { _id: -1 } });
+    pipeline.push({ $limit: limit });
+    let res = {
+        pipeline,
+        details: {
+            limit,
+            accessartikli: skupineIzdelkov && skupineIzdelkov.length,
+            accessStranke: skupineStrank && skupineStrank.length,
+        }
+    };
+    log.trace("aggregation pipeline created", res);
+    return res;
+}
+function prepareForRegex(x) {
+    return x.replace(/(\/|-|\+|\,|\s)+/g, ".*");
+}
+function toArray(x) {
+    if (!x)
+        return [];
+    if (x instanceof Array)
+        return x;
+    return [x];
+}
+/**
+ * Izvede aggregation pipeline za iskanje po računihrouter.mode
+ * @param {array} pipeline
+ * @param {string} tenant
+ */
+async function execPipeline(tenant, pipeline) {
+    assert(tenant);
+    assert(pipeline);
+    log.trace("Exec pipeline for tenant", tenant, pipeline);
+    for (let stage of pipeline)
+        log.trace("  ... stage ", stage);
+    let repo = new Repo('racuni', tenant);
+    try {
+        let start = performance.now();
+        let ret = await repo.aggregate(pipeline);
+        let end = performance.now();
+        await repo.close();
+        return {
+            ok: true,
+            data: ret,
+            executionMs: end - start,
+        };
+    }
+    catch (err) {
+        log.error('q-isciPoRacunih aggregation exec error', err);
+        return {
+            ok: false,
+            error: err,
+        };
+    }
+}
+function createCsv(ret) {
+    let lines = [];
+    if (ret.length) {
+        // headers
+        let keys = [];
+        let dataFields = Object.keys(ret[0]).filter(k => k != "_id").map(k => k);
+        lines.push([...keys, ...dataFields].join(","));
+        // all lines
+        for (let line of ret) {
+            let l = [];
+            //for (let key in line._id) l.push('"'+(key==="davčna stopnja"?`${(line._id[key]*100)}%` : line._id[key])+'"')
+            for (let key in line)
+                if (key != "_id")
+                    l.push('"' + line[key] + '"');
+            lines.push(l.join(","));
+        }
+    }
+    return lines;
+}
+export { createAggregationPipeline, execPipeline, createCsv };
+// (async  function() {
+//     console.time('aggregation')
+//     let pipeline = createAggregationPipeline({
+//             stevilka: "CVE-NB-1",
+//             //mpc: { $gte: 20 }
+//             //kategorije: [ "zdravilo", "izdelek"]
+//             // limit: 3,
+//             // skupineIzdelkov: [ 'wa' ]
+//             // clearskupineStrank: ['qqw']
+//     })
+//     for(let p of pipeline.pipeline) console.log(p)
+//     let result = await execPipeline("cvenkel", pipeline.pipeline)
+//     console.log('result',result);
+//     for (let d of result.data || []) console.log((d as any).stevilka, (d as any).datum)
+//     //createCsv(result.data).map(l => console.log(l))
+//     console.timeEnd('aggregation')
+//     process.exit(0)
+// })();
+//# sourceMappingURL=q-isciPoRacunih.mjs.map

package/dist/q-isciPoRacunih.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"q-isciPoRacunih.mjs","sourceRoot":"","sources":["../src/q-isciPoRacunih.mts"],"names":[],"mappings":"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"}

package/dist/q-mojPromet.d.mts

@@ -0,0 +1,26 @@
+interface MojPrometParams {
+    odDne: Date;
+    doDne: Date;
+    username: string | string[];
+    rounding: number;
+    stevilka: string;
+    brezDavka?: boolean;
+    kategorije?: string[];
+}
+declare function createAggregationPipeline({ odDne, doDne, stevilka, username, rounding, brezDavka, kategorije, }: Partial<MojPrometParams>): {
+    pipeline: any[];
+    match: any;
+};
+declare function execPipeline(pipeline: object[], tenant: string): Promise<{
+    ok: boolean;
+    data: unknown;
+    executionMs: number;
+    error?: undefined;
+} | {
+    ok: boolean;
+    error: unknown;
+    data?: undefined;
+    executionMs?: undefined;
+}>;
+export { createAggregationPipeline, execPipeline, };
+//# sourceMappingURL=q-mojPromet.d.mts.map

package/dist/q-mojPromet.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"q-mojPromet.d.mts","sourceRoot":"","sources":["../src/q-mojPromet.mts"],"names":[],"mappings":"AAQA,UAAW,eAAe;IACtB,KAAK,EAAE,IAAI,CAAC;IACZ,KAAK,EAAE,IAAI,CAAC;IACZ,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACzB;AAED,iBAAS,yBAAyB,CAC9B,EACI,KAAK,EACL,KAAK,EACL,QAAQ,EACR,QAAQ,EACR,QAAY,EACZ,SAAiB,EACjB,UAAe,GAElB,EAAE,OAAO,CAAC,eAAe,CAAC;;;EA4H9B;AAED,iBAAe,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAC,MAAM,EAAC,MAAM;;;;;;;;;;GA0B3D;AAED,OAAO,EACH,yBAAyB,EACzB,YAAY,GACf,CAAC"}

package/dist/q-mojPromet.mjs

@@ -0,0 +1,163 @@
+import { Log } from 'cry-helpers';
+import { Repo } from "cry-db";
+import { performance } from 'perf_hooks';
+let log = new Log(['KLIKVET', 'KLIKVET-PROMET']);
+function createAggregationPipeline({ odDne, doDne, stevilka, username, rounding = 0, brezDavka = false, kategorije = [], }) {
+    // COMPOSE PIPELINE NOW
+    let pipeline = [];
+    // match št.računa and time criteria
+    let match = { $match: { datum: { $gte: new Date(odDne), $lte: new Date(doDne) } } };
+    if (stevilka)
+        match.$match.stevilka = new RegExp(stevilka, "g");
+    pipeline.push(match);
+    function kriterijUporabnika(polje) {
+        if (!username || username.length === 0)
+            return {};
+        if (username instanceof Array) {
+            return { [polje]: { $in: username } };
+        }
+        else
+            return { [polje]: username };
+    }
+    function kriterijiKategorije(kriteriji) {
+        if (kategorije?.length)
+            kriteriji["postavke.kategorija"] = { $in: kategorije };
+        return kriteriji;
+    }
+    function neposredno(polje) {
+        let fld = brezDavka ? "$prc" : "$mpc";
+        return [
+            { $match: kriterijUporabnika(polje) },
+            {
+                $addFields: {
+                    rvc: { $multiply: ["$kolicina", "$rvc"] },
+                }
+            },
+            {
+                $addFields: {
+                    promet_dezurstvo: { $cond: { if: { $eq: ["$dezurstvo", true] }, then: fld, else: 0 } },
+                    promet_ne_dezurstvo: { $cond: { if: { $ne: ["$dezurstvo", true] }, then: fld, else: 0 } },
+                    rvc_dezurstvo: { $cond: { if: { $eq: ["$dezurstvo", true] }, then: "$rvc", else: 0 } },
+                    rvc_ne_dezurstvo: { $cond: { if: { $ne: ["$dezurstvo", true] }, then: "$rvc", else: 0 } },
+                }
+            },
+            {
+                $group: {
+                    _id: { kdo: `$${polje}` },
+                    promet: { $sum: fld },
+                    popusti: { $sum: "$pop" },
+                    prometDezurstvo: { $sum: "$promet_dezurstvo" },
+                    prometNeDezurstvo: { $sum: "$promet_ne_dezurstvo" },
+                    rvc: { $sum: "$rvc" },
+                    rvcDezurstvo: { $sum: "$rvc_dezurstvo" },
+                    rvcNeDezurstvo: { $sum: "$rvc_ne_dezurstvo" },
+                }
+            },
+            {
+                $project: {
+                    _id: 0, kdo: "$_id.kdo",
+                    promet: { $round: ["$promet", rounding] },
+                    popusti: { $round: ["$popusti", rounding] },
+                    prometDezurstvo: { $round: ["$prometDezurstvo", rounding] },
+                    prometNeDezurstvo: { $round: ["$prometNeDezurstvo", rounding] },
+                    rvcDezurstvo: { $round: ["$rvcDezurstvo", rounding] },
+                    rvcNeDezurstvo: { $round: ["$rvcNeDezurstvo", rounding] },
+                    rvc: { $round: ["$rvc", rounding] },
+                }
+            },
+        ];
+    }
+    function posredno() {
+        let fld = brezDavka ? "$postavke.tprc" : "$postavke.tmpc";
+        return [
+            { $unwind: "$postavke" },
+            { $match: kriterijiKategorije(kriterijUporabnika("postavke.dodal")) },
+            {
+                $addFields: {
+                    trvc: { $multiply: ["$postavke.kolicina", "$postavke.rvc"] },
+                }
+            },
+            {
+                $addFields: {
+                    promet_dezurstvo: { $cond: { if: { $eq: ["$dezurstvo", true] }, then: fld, else: 0 } },
+                    promet_ne_dezurstvo: { $cond: { if: { $ne: ["$dezurstvo", true] }, then: fld, else: 0 } },
+                    rvc_dezurstvo: { $cond: { if: { $eq: ["$dezurstvo", true] }, then: "$trvc", else: 0 } },
+                    rvc_ne_dezurstvo: { $cond: { if: { $ne: ["$dezurstvo", true] }, then: "$trvc", else: 0 } },
+                }
+            },
+            {
+                $group: {
+                    _id: { kdo: "$postavke.dodal" },
+                    prometDezurstvo: { $sum: "$promet_dezurstvo" },
+                    prometNeDezurstvo: { $sum: "$promet_ne_dezurstvo" },
+                    rvcDezurstvo: { $sum: "$rvc_dezurstvo" },
+                    rvcNeDezurstvo: { $sum: "$rvc_ne_dezurstvo" },
+                    promet: { $sum: fld },
+                    popusti: { $sum: "$postavke.tpop" },
+                    rvc: { $sum: "$trvc" },
+                }
+            },
+            {
+                $project: {
+                    _id: 0, kdo: "$_id.kdo",
+                    promet: { $round: ["$promet", rounding] },
+                    prometDezurstvo: { $round: ["$prometDezurstvo", rounding] },
+                    prometNeDezurstvo: { $round: ["$prometNeDezurstvo", rounding] },
+                    rvcDezurstvo: { $round: ["$rvcDezurstvo", rounding] },
+                    rvcNeDezurstvo: { $round: ["$rvcNeDezurstvo", rounding] },
+                    popusti: { $round: ["$popusti", rounding] },
+                    rvc: { $round: ["$rvc", rounding] },
+                }
+            },
+        ];
+    }
+    pipeline.push({
+        $facet: {
+            dodal: posredno(),
+            izdal: neposredno("izdal"),
+            odprl: neposredno("odprl"),
+        }
+    });
+    log.trace("aggregation pipeline created", pipeline);
+    return { pipeline, match: match.$match };
+}
+async function execPipeline(pipeline, tenant) {
+    if (!tenant)
+        throw new Error("q-prodano: must specify tenant");
+    let repo = new Repo('racuni', tenant);
+    try {
+        let start = performance.now();
+        let ret = await repo.aggregate(pipeline);
+        let end = performance.now();
+        await repo.close();
+        return {
+            ok: true,
+            data: ret[0],
+            executionMs: end - start,
+        };
+    }
+    catch (err) {
+        console.error(err);
+        log.error('q-prodano aggregation exec error', err);
+        return {
+            ok: false,
+            error: err,
+        };
+    }
+}
+export { createAggregationPipeline, execPipeline, };
+// (async  function() {
+//     console.time('aggregation')
+//     let pipeline = createAggregationPipeline({
+//         odDne: new Date("2023-01-01"),
+//         doDne: new Date("2023-12-28"),
+//         username: "vice",
+//         brezDavka: true,
+//         kategorije: ["izdelek"]
+//     })
+//     console.dir(pipeline,{depth:20,colors:1});
+//     let result = await execPipeline(pipeline.pipeline, "prvak")
+//     console.dir(result.data, { depth: 10, colors: 1 })
+//     process.exit(1)
+// })(); 
+//# sourceMappingURL=q-mojPromet.mjs.map

package/dist/q-mojPromet.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"q-mojPromet.mjs","sourceRoot":"","sources":["../src/q-mojPromet.mts"],"names":[],"mappings":"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"}

package/dist/q-porabaZdravil.d.mts

@@ -0,0 +1,33 @@
+import { Id } from './types/shared.mjs';
+import { VrstaBlagovnice } from "./types/VrsteDokumentov.mjs";
+interface PorabaZdrailParams {
+    tenant: string;
+    skladisca?: Id[];
+    timeQuery: string;
+}
+export declare function prodajaZdravil(spec?: Partial<PorabaZdrailParams>): Promise<Prodaja[]>;
+export declare function dobavaZdravil(spec?: Partial<PorabaZdrailParams>): Promise<Poraba[]>;
+export declare function porabaZdravil(spec?: Partial<PorabaZdrailParams>): Promise<Poraba[]>;
+interface PodatkiZaArtikel {
+    artikel_id: Id;
+    skladisce_id?: string;
+    porabe: Record<string, number>;
+    skupaj: number;
+}
+interface Poraba {
+    vrsta: VrstaBlagovnice;
+    artikel_id: Id;
+    skladisce_id?: Id;
+    poraba: number;
+}
+interface Prodaja {
+    artikel_id: Id;
+    skladisce_id?: Id;
+    poraba: number;
+}
+export declare function porabaInProdajaZdravil(spec?: Partial<PorabaZdrailParams>): Promise<{
+    zdruzeno: PodatkiZaArtikel[];
+    vrste: unknown[];
+}>;
+export {};
+//# sourceMappingURL=q-porabaZdravil.d.mts.map

package/dist/q-porabaZdravil.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"q-porabaZdravil.d.mts","sourceRoot":"","sources":["../src/q-porabaZdravil.mts"],"names":[],"mappings":"AAGA,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAE9D,UAAU,kBAAkB;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;CACrB;AAeD,wBAAsB,cAAc,CAAC,IAAI,GAAE,OAAO,CAAC,kBAAkB,CAAM,GAAI,OAAO,CAAC,OAAO,EAAE,CAAC,CAsChG;AAGD,wBAAsB,aAAa,CAAC,IAAI,GAAE,OAAO,CAAC,kBAAkB,CAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAuC7F;AAID,wBAAsB,aAAa,CAAE,IAAI,GAAE,OAAO,CAAC,kBAAkB,CAAM,GAAK,OAAO,CAAC,MAAM,EAAE,CAAC,CAwChG;AAED,UAAU,gBAAgB;IACtB,UAAU,EAAE,EAAE,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,MAAM,EAAE,MAAM,CAAC;CAClB;AAED,UAAU,MAAM;IACZ,KAAK,EAAE,eAAe,CAAC;IACvB,UAAU,EAAE,EAAE,CAAC;IACf,YAAY,CAAC,EAAE,EAAE,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;CAClB;AAED,UAAU,OAAO;IACb,UAAU,EAAE,EAAE,CAAC;IACf,YAAY,CAAC,EAAE,EAAE,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;CAClB;AA4CD,wBAAsB,sBAAsB,CAAC,IAAI,GAAE,OAAO,CAAC,kBAAkB,CAAM;;;GAMlF"}

package/dist/q-porabaZdravil.mjs

@@ -0,0 +1,180 @@
+import { Repo } from "cry-db";
+import { times } from "cry-dateranges";
+function calcTimeQuery(timeQuery) {
+    let timeRanges = times(timeQuery);
+    return [
+        timeRanges.dates.query,
+        timeRanges.dayMonths.query,
+        timeRanges.years.query,
+        timeRanges.months.query,
+        timeRanges.days.query,
+        timeRanges.weekdays.query,
+        timeRanges.hours.query,
+    ].flat().filter(k => Object.keys(k).length);
+}
+export async function prodajaZdravil(spec = {}) {
+    spec.timeQuery = spec.timeQuery || new Date().getFullYear().toString();
+    const allTimeCriteria = calcTimeQuery(spec.timeQuery);
+    let matchSkladisce = spec.skladisca?.length ? { skladisce_id: "$skladisce_id" } : {};
+    let projectSkladisce = spec.skladisca?.length ? { skladisce_id: "$_id.skladisce_id" } : {};
+    let match = {
+        $match: {
+            $and: allTimeCriteria,
+        }
+    };
+    if (spec.skladisca?.length)
+        match.$match.$and.push({ skladisce_id: { $in: spec.skladisca.map(s => Repo.objectid(s)) } });
+    let pipeline = [
+        match,
+        { $unwind: "$postavke" },
+        { $match: { "postavke.kategorija": "zdravilo" } },
+        {
+            $group: {
+                _id: { artikel_id: "$postavke.artikel_id", ...matchSkladisce },
+                poraba: { $sum: "$postavke.kolicina" },
+            }
+        },
+        {
+            $project: {
+                artikel_id: "$_id.artikel_id",
+                poraba: { $round: ["$poraba", 2] },
+                ...projectSkladisce,
+                _id: 0
+            }
+        }
+    ];
+    // console.dir(pipeline, { depth: 10 });
+    let repo = new Repo('racuni', spec.tenant);
+    let ret = await repo.aggregate(pipeline);
+    await repo.close();
+    return ret;
+}
+export async function dobavaZdravil(spec = {}) {
+    spec.timeQuery = spec.timeQuery || new Date().getFullYear().toString();
+    const allTimeCriteria = calcTimeQuery(spec.timeQuery);
+    let matchSkladisce = spec.skladisca?.length ? { skladisce_id: "$skladisce_id" } : {};
+    let projectSkladisce = spec.skladisca?.length ? { skladisce_id: "$_id.skladisce_id" } : {};
+    let match = {
+        $match: {
+            $and: allTimeCriteria,
+        }
+    };
+    match.$match.$and.push({ vrsta: "dobava" });
+    if (spec.skladisca?.length)
+        match.$match.$and.push({ skladisce_id: { $in: spec.skladisca.map(s => Repo.objectid(s)) } });
+    let pipeline = [
+        match,
+        { $unwind: "$postavke" },
+        { $match: { "postavke.kategorija": "zdravilo" } },
+        {
+            $group: {
+                _id: { vrsta: "$vrsta", artikel_id: "$postavke.artikel_id", ...matchSkladisce },
+                poraba: { $sum: "$postavke.kolicina" },
+            }
+        },
+        {
+            $project: {
+                artikel_id: "$_id.artikel_id",
+                vrsta: "$_id.vrsta",
+                poraba: { $round: ["$poraba", 2] },
+                ...projectSkladisce,
+                _id: 0
+            }
+        }
+    ];
+    // console.dir(pipeline, {depth:10});
+    let repo = new Repo('blagovnice', spec.tenant);
+    let ret = await repo.aggregate(pipeline);
+    await repo.close();
+    return ret;
+}
+export async function porabaZdravil(spec = {}) {
+    spec.timeQuery = spec.timeQuery || new Date().getFullYear().toString();
+    const allTimeCriteria = calcTimeQuery(spec.timeQuery);
+    let matchSkladisce = spec.skladisca?.length ? { skladisce_id: "$skladisce_id" } : {};
+    let projectSkladisce = spec.skladisca?.length ? { skladisce_id: "$_id.skladisce_id" } : {};
+    let match = {
+        $match: {
+            $and: allTimeCriteria,
+        }
+    };
+    match.$match.$and.push({ vrsta: { $not: { $in: ["dobava", /*"vnos", "iznos", "prenos", */ "naročilo"] } } });
+    if (spec.skladisca?.length)
+        match.$match.$and.push({ skladisce_id: { $in: spec.skladisca.map(s => Repo.objectid(s)) } });
+    let pipeline = [
+        match,
+        { $unwind: "$postavke" },
+        { $match: { "postavke.kategorija": "zdravilo" } },
+        {
+            $group: {
+                _id: { vrsta: "$vrsta", artikel_id: "$postavke.artikel_id", ...matchSkladisce },
+                poraba: { $sum: "$postavke.kolicina" },
+            }
+        },
+        {
+            $project: {
+                artikel_id: "$_id.artikel_id",
+                vrsta: "$_id.vrsta",
+                poraba: { $round: ["$poraba", 2] },
+                ...projectSkladisce,
+                _id: 0
+            }
+        }
+    ];
+    // console.dir(pipeline, {depth:10});
+    let repo = new Repo('blagovnice', spec.tenant);
+    let ret = await repo.aggregate(pipeline);
+    await repo.close();
+    return ret;
+}
+function zdruzi(porabe, prodaje) {
+    let key = (ZaArtikel) => `${ZaArtikel.artikel_id}-${ZaArtikel.skladisce_id || ''}`;
+    let zdruzenoObj = {};
+    let vseVrste = new Set();
+    porabe.forEach(p => {
+        zdruzenoObj[key(p)] = zdruzenoObj[key(p)] || {
+            artikel_id: p.artikel_id,
+            skladisce_id: p.skladisce_id,
+            porabe: {},
+            skupaj: 0
+        };
+        zdruzenoObj[key(p)].porabe[p.vrsta] = (zdruzenoObj[key(p)].porabe[p.vrsta] || 0) + p.poraba;
+        vseVrste.add(p.vrsta);
+    });
+    let vrste = Array.from(vseVrste).sort();
+    prodaje.forEach(p => {
+        zdruzenoObj[key(p)] = zdruzenoObj[key(p)] || {
+            artikel_id: p.artikel_id,
+            skladisce_id: p.skladisce_id,
+            porabe: { prodaja: 0 },
+            skupaj: 0,
+        };
+        zdruzenoObj[key(p)].porabe.prodaja = (zdruzenoObj[key(p)].porabe.prodaja || 0) + p.poraba;
+    });
+    let zdruzeno = Object.values(zdruzenoObj);
+    // počisti
+    for (let artikel of zdruzeno) {
+        if (!artikel.skladisce_id)
+            delete artikel.skladisce_id;
+        artikel.skupaj = Object.values(artikel.porabe).reduce((p, c) => p + c, 0);
+    }
+    vrste.unshift("prodaja");
+    return { zdruzeno, vrste };
+}
+export async function porabaInProdajaZdravil(spec = {}) {
+    let poraba = await porabaZdravil(spec);
+    let prodaja = await prodajaZdravil(spec);
+    return zdruzi(poraba, prodaja);
+}
+// (async  function() {
+//    let oboje = await porabaInProdajaZdravil({
+//        tenant: "zvitorepka",
+//     //    skladisca: ["5fbec4984692f458bb067f30"]
+//    })
+//     console.dir(oboje, { depth: 10 });
+//     let csv = createCsv(oboje.zdruzeno, { headersOnly: false, prettyPrint: true, exportIdFields: true })
+//     for (let i = 0; i < oboje.zdruzeno.length && i < 2; i++)
+//         console.log(csv[i])
+//     process.exit(0)
+// })();
+//# sourceMappingURL=q-porabaZdravil.mjs.map

package/dist/q-porabaZdravil.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"q-porabaZdravil.mjs","sourceRoot":"","sources":["../src/q-porabaZdravil.mts"],"names":[],"mappings":"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"}

package/dist/q-prodano.d.mts

@@ -0,0 +1,27 @@
+import { Kategorija } from './types/shared.mjs';
+interface PorabljenoParams {
+    odDne: Date;
+    doDne: Date;
+    rounding: number;
+    skladisca: string[];
+    lokacije: string[];
+    kategorije: Kategorija[];
+    stevilka: string | undefined;
+}
+declare function createAggregationPipeline({ odDne, doDne, stevilka, kategorije, skladisca, lokacije, }: Partial<PorabljenoParams>): {
+    pipeline: any[];
+    match: any;
+};
+declare function execPipeline(pipeline: object[], tenant: string): Promise<{
+    ok: boolean;
+    data: unknown[];
+    executionMs: number;
+    error?: undefined;
+} | {
+    ok: boolean;
+    error: unknown;
+    data?: undefined;
+    executionMs?: undefined;
+}>;
+export { createAggregationPipeline, execPipeline, };
+//# sourceMappingURL=q-prodano.d.mts.map

package/dist/q-prodano.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"q-prodano.d.mts","sourceRoot":"","sources":["../src/q-prodano.mts"],"names":[],"mappings":"AAKA,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAIhD,UAAU,gBAAgB;IACtB,KAAK,EAAE,IAAI,CAAC;IACZ,KAAK,EAAE,IAAI,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,UAAU,EAAE,UAAU,EAAE,CAAC;IACzB,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;CAChC;AAED,iBAAS,yBAAyB,CAC9B,EACI,KAAK,EACL,KAAK,EACL,QAAoB,EACpB,UAAe,EACf,SAAc,EACd,QAAa,GAChB,EAAE,OAAO,CAAC,gBAAgB,CAAC;;;EA0E/B;AAED,iBAAe,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAC,MAAM,EAAC,MAAM;;;;;;;;;;GAuC3D;AAED,OAAO,EACH,yBAAyB,EACzB,YAAY,GACf,CAAC"}