js-klikvet-logic-worker 2.3.28 → 2.3.30

package/src/worker.mts

@@ -1,13 +1,13 @@
 
 import assert from 'assert'
 import clonedeep from 'lodash.clonedeep'
-import makeDir from 'make-dir'
 import fs from 'fs'
 import path from 'path'
+import { makeDirectorySync } from 'make-dir'
 import { Worker, Client } from 'cry-ebus2'
 import { Mongo } from 'cry-db'
 import { Log, serialize, sleep } from 'cry-helpers'
-import { Blagajna, Blagovnica, Cepljenje, Narocen, Nastavitve, Poslovalnica, PostavkaRacuna, Racun, Skladisce, VrstaPoslovnegaDogodka, VrstaRazknjizbeZdravila, VsotaDobavZaObdobje, anonimizirajPodatke, certs, createMongoForAnonimizacija, dobavaZdravil, ensureIndexes, karticaArtikla, koledarVeterinarja, mojPromet, pobrisiNeuporabljeno, podatkiRejca, poisciBlagovnice, poisciNeuporabljeno, porabaInProdajaZdravil, prodajaZdravil, prodano, prodanoInPorabljeno, promet, racuni, racunovodji, razknjiziBlagovnico, razknjiziDobavnico, smsCepljen, smsCepljenjaNaDan, smsNarocen, smsNaroceniNaDan, spremembaZalogeZaObdobje, spremeniZalogoNaPodlagiRacuna, stranke, updateOpombeRejca, updatePotrditevBrejosti, updatePresusitve, updateStatusOsemenitve, zakljucekBlagajne, zakljucekPolneInventureSestaviInZapisi, zalogaNaDan, zalogaPoDnevih, zaracunajDobavnice, zdruziStranke, zdruziPaciente, Obravnava, ArtikelKarkoli, zapisiPoraboZaObravnavo, zapisiPorabeZaObravnave, zapisiPorabeZaDobavnice, } from 'cry-klikvet-logic'
+import { Blagajna, Blagovnica, Cepljenje, Narocen, Nastavitve, Poslovalnica, PostavkaRacuna, Racun, Skladisce, VrstaPoslovnegaDogodka, VrstaRazknjizbeZdravila, VsotaDobavZaObdobje, anonimizirajPodatke, certs, createMongoForAnonimizacija, dobavaZdravil, ensureIndexes, karticaArtikla, koledarVeterinarja, mojPromet, pobrisiNeuporabljeno, podatkiRejca, poisciBlagovnice, poisciNeuporabljeno, porabaInProdajaZdravil, prodajaZdravil, prodano, prodanoInPorabljeno, promet, racuni, racunovodji, razknjiziBlagovnico, razknjiziDobavnico, smsCepljen, smsCepljenjaNaDan, smsNarocen, smsNaroceniNaDan, spremembaZalogeZaObdobje, spremeniZalogoNaPodlagiRacuna, stranke, updateOpombeRejca, updatePotrditevBrejosti, updatePresusitve, updateStatusOsemenitve, zakljucekBlagajne, zakljucekPolneInventureSestaviInZapisi, zalogaNaDan, zalogaPoDnevih, zaracunajDobavnice, zdruziStranke, zdruziPaciente, Obravnava, ArtikelKarkoli, zapisiPoraboZaObravnavo, zapisiPorabeZaObravnave, zapisiPorabeZaDobavnice, pmzUpdateAllForYear } from 'cry-klikvet-logic'
 import { OsemenitevGoveda, StatusOsemenitve } from 'cry-klikvet-logic/dist/types/teren.mjs'
 import { RacunZaKnjizbo } from 'cry-klikvet-logic/dist/spremeniZalogo.mjs'
 import { Dobavnica } from 'cry-klikvet-logic/dist/types/Dobavnica.mjs'
@@ -26,7 +26,8 @@ export type KlikvetClientRequest = "ping"
     | { operation: "promet-exec-pipeline", tenant: string, pipeline?: Obj, spec?: Obj }
     | { operation: "racuni-isci-exec-pipeline", tenant: string, pipeline: Obj, spec?: Obj }
     | { operation: "porocilo-racunovodji", tenant: string, odDne: Date, doDne: Date, racuniPravnim?: boolean, racuniOdlozeno?: boolean, lokacija?: string, lokacije?: string[], skladisca?: string[] }
-    | { operation: "zakljucek-blagajne", tenant: string, odDne: Date, doDne: Date, rounding: number, stevilka?: string, vsiRacuni?: boolean, TRRRacuni?: boolean }
+    | { operation: "zakljucek-blagajne", tenant: string, odDne: Date, doDne: Date, rounding: number, stevilka?: string, vsiRacuni?: boolean, TRRRacuni?: boolean, racuniPravnim?: boolean }
+    | { operation: "gotovinski-racuni", tenant: string, odDne: Date, doDne: Date, rounding: number, stevilka?: string,  }
     | { operation: "moj-promet", tenant: string, username: string, odDne: Date, doDne: Date }
     | { operation: "prodano", tenant: string, username: string, odDne: Date, doDne: Date }
     | { operation: "prodano-porabljeno", tenant: string; poArtiklih: boolean; poSkladiscih: boolean; poVrstah: boolean; poDst: boolean; timeQuery?: string; skladisca?: string[]; vrste?: VrstaPoslovnegaDogodka[]; }
@@ -78,6 +79,7 @@ export type KlikvetClientRequest = "ping"
     | { operation: "razknjizi-dobavnico", tenant: string, _id: string }
     | { operation: "zdruzi-stranke", tenant: string, v: string, iz: string[] }
     | { operation: "zdruzi-paciente", tenant: string, v: string, iz: string[] }
+    | { operation: "pmz-update", tenant: string, year: number }
     ;
 
 
@@ -115,11 +117,11 @@ export class KlikvetLogicWorker extends Worker {
     async porabaZaObravnavo(mongo: Mongo, data: { tenant: string, id: string, username: string }) {
         console.log('porabaZaObravnavo',data);
         
-        let nastavitve = await this.dbNastavitve(data.tenant);
-        let obravnava = await this.dbFindById<Obravnava>(data.tenant, "obravnave", data.id);
+        let nastavitve = await this.dbNastavitve(data.tenant, mongo);
+        let obravnava = await this.dbFindById<Obravnava>(data.tenant, "obravnave", data.id, mongo);
         if (!obravnava) throw new Error("porabaZaObravnavo: ni obravnave " + data?.id);
         let artikel_ids = obravnava.koraki.map(k => (k.postavke || []).map(p => p.artikel_id)).flat(2).filter(a => !!a);
-        let artikli = await this.dbFind<ArtikelKarkoli>(data.tenant, "artikli", { _id: { $in: artikel_ids } });
+        let artikli = await this.dbFind<ArtikelKarkoli>(data.tenant, "artikli", { _id: { $in: artikel_ids } }, {}, mongo);
         let poraba = await zapisiPoraboZaObravnavo({ tenant: data.tenant, mongo, obravnava, nastavitve, username: data.username, artikli });
 
         console.log('poraba',poraba);
@@ -142,14 +144,34 @@ export class KlikvetLogicWorker extends Worker {
         }
     }
 
+    private configureMongoInstance(mongo: Mongo) {
+        mongo.useSoftDelete(true)
+        mongo.useRevisions(true)
+        mongo.useAuditing(true)
+        mongo.emitPublishEvents(true)
+        mongo.on('publish', this.publishMsg.bind(this))
+        return mongo
+    }
+
+    private async withNewMongo<T>(fn: (mongo: Mongo) => Promise<T>): Promise<T> {
+        const mongo = this.configureMongoInstance(new Mongo())
+        try {
+            return await fn(mongo)
+        } catch (err) {
+            console.error('withNewMongo error', err)
+            throw err
+        } finally {
+            try {
+                await mongo.close()
+            } catch (closeErr) {
+                console.error('withNewMongo close error', closeErr)
+            }
+        }
+    }
+
     async resetMongo() {
         if (this.mongo) await this.mongo.close()
-        this.mongo = new Mongo()
-        this.mongo.useSoftDelete(true)
-        this.mongo.useRevisions(true)
-        this.mongo.useAuditing(true)
-        this.mongo.emitPublishEvents(true)
-        this.mongo.on('publish', this.publishMsg.bind(this))
+        this.mongo = this.configureMongoInstance(new Mongo())
     }
 
     async closeMongo() {
@@ -237,9 +259,9 @@ export class KlikvetLogicWorker extends Worker {
         }
 
         if (data.operation === 'porocilo-racunovodji') {
-            assert(data.tenant, 'must tenant')
-            assert(data.odDne, 'must odDne')
-            assert(data.doDne, 'must doDne')
+            assert(data.tenant, 'porocilo-racunovodji must tenant')
+            assert(data.odDne, 'porocilo-racunovodji must odDne')
+            assert(data.doDne, 'porocilo-racunovodji must doDne')
 
             let pipeline = await racunovodji.createAggregationPipeline(data)
             let podatki = await racunovodji.execPipeline(pipeline.pipeline, data.tenant)
@@ -276,13 +298,22 @@ export class KlikvetLogicWorker extends Worker {
             if (data.TRRRacuni) {
                 ret.TRRRacuni = await zakljucekBlagajne.TRRRacuni(pipeline.match, data.tenant);
             }
+            if (data.racuniPravnim) {
+                ret.racuniPravnim = await racunovodji.getTaxBills(data.tenant, pipeline.match);
+            }
+            return ret;
+        }
+
+        if (data.operation === 'gotovinski-racuni') {
+            let pipeline = zakljucekBlagajne.createAggregationPipeline(data);
+            let ret = await racunovodji.getCashBills(data.tenant, pipeline.match);
             return ret;
         }
 
         if (data.operation === 'moj-promet') {
-            assert(data.username, 'must specify username')
-            assert(data.odDne, 'must specify odDne')
-            assert(data.doDne, 'must specify doDne')
+            assert(data.username, 'moj-promet must specify username')
+            assert(data.odDne, 'moj-promet must specify odDne')
+            assert(data.doDne, 'moj-promet must specify doDne')
 
             let pipeline = mojPromet.createAggregationPipeline(data)
             let podatki = await mojPromet.execPipeline(pipeline.pipeline, data.tenant)
@@ -290,9 +321,9 @@ export class KlikvetLogicWorker extends Worker {
         }
 
         if (data.operation === 'prodano') {
-            assert(data.tenant, 'must specify tenant')
-            assert(data.odDne, 'must specify odDne')
-            assert(data.doDne, 'must specify doDne')
+            assert(data.tenant, 'prodano must specify tenant')
+            assert(data.odDne, 'prodano must specify odDne')
+            assert(data.doDne, 'prodano must specify doDne')
 
             let pipeline = prodano.createAggregationPipeline(data)
             let podatki = await prodano.execPipeline(pipeline.pipeline, data.tenant)
@@ -300,7 +331,7 @@ export class KlikvetLogicWorker extends Worker {
         }
 
         if (data.operation === 'prodano-porabljeno') {
-            assert(data.tenant, 'must specify tenant')
+            assert(data.tenant, 'prodano-porabljeno must specify tenant')
             let podatki = await prodanoInPorabljeno(data)
             return podatki;
         }
@@ -536,10 +567,14 @@ export class KlikvetLogicWorker extends Worker {
         if (data.operation === "furs-register-invoice") {
             let res = await this.registerInvoice(data);
             setTimeout(async () => {
-                await this.resetMongo();
-                await this.registerAllInvoices(data);
-                await this.razknjiziRacune(data);
-                await this.closeMongo();
+                try {
+                    await this.withNewMongo(async mongo => {
+                        await this.registerAllInvoices(data, mongo);
+                        await this.razknjiziRacune(data, mongo);
+                    });
+                } catch (err) {
+                    console.error('delayed registerAllInvoices failed', err);
+                }
             }, 2000);
             return res
         };
@@ -547,9 +582,13 @@ export class KlikvetLogicWorker extends Worker {
         if (data.operation === "furs-register-all-invoices") {
             let all = await this.registerAllInvoices(data);
             setTimeout(async () => {
-                await this.resetMongo();
-                await this.razknjiziRacune(data);
-                await this.closeMongo();
+                try {
+                    await this.withNewMongo(async mongo => {
+                        await this.razknjiziRacune(data, mongo);
+                    });
+                } catch (err) {
+                    console.error('delayed razknjiziRacune failed', err);
+                }
             }, 4000)
             return all
         };
@@ -605,9 +644,13 @@ export class KlikvetLogicWorker extends Worker {
             await this.razknjiziDobavnico(data._id, data.tenant)
 
             setImmediate(async () => {
-                await this.resetMongo();
-                await this.razknjiziDobavnice(data);
-                await this.closeMongo();
+                try {
+                    await this.withNewMongo(async mongo => {
+                        await this.razknjiziDobavnice(data, mongo);
+                    });
+                } catch (err) {
+                    console.error('delayed razknjiziDobavnice failed', err);
+                }
             });
 
             return { ok: true }
@@ -619,9 +662,13 @@ export class KlikvetLogicWorker extends Worker {
             await this.razknjiziBlagovnico(data._id, data.tenant)
 
             setImmediate(async () => {
-                await this.resetMongo();
-                await this.razknjiziBlagovnice(data);
-                await this.closeMongo();
+                try {
+                    await this.withNewMongo(async mongo => {
+                        await this.razknjiziBlagovnice(data, mongo);
+                    });
+                } catch (err) {
+                    console.error('delayed razknjiziBlagovnice failed', err);
+                }
             });
 
             return { ok: true }
@@ -875,6 +922,13 @@ export class KlikvetLogicWorker extends Worker {
             return await this.zdruziPaciente(data);
         };
 
+        if (data.operation === "pmz-update") {
+            assert(data.tenant, "must specify tenant")
+            assert(data.year, "must specify year");
+
+            return await pmzUpdateAllForYear({tenant: data.tenant, year: parseInt(data.year?.toString()), writeToDb: true});
+        };
+
         assert(false, 'unsupported operation ' + (data as { operation: string }).operation)
     }
 
@@ -882,29 +936,39 @@ export class KlikvetLogicWorker extends Worker {
     /** PRIVATE */
 
 
-    async dbNastavitve(tenant: string) {
-        this.mongo!.setDb(tenant)
-        return (await this.mongo!.findOne("nastavitve", {})) as Nastavitve;
+    async dbNastavitve(tenant: string, mongo?: Mongo) {
+        const db = mongo ?? this.mongo
+        assert(db, 'missing Mongo instance')
+        db.setDb(tenant)
+        return (await db.findOne("nastavitve", {})) as Nastavitve;
     }
 
-    async dbFindById<T>(db: string, collection: string, _id: string) {
-        this.mongo!.setDb(db)
-        return await this.mongo!.findById(collection, _id) as T
+    async dbFindById<T>(db: string, collection: string, _id: string, mongo?: Mongo) {
+        const m = mongo ?? this.mongo
+        assert(m, 'missing Mongo instance')
+        m.setDb(db)
+        return await m.findById(collection, _id) as T
     }
 
-    async dbFind<T>(db: string, collection: string, query: Obj, opts?: Obj) {
-        this.mongo!.setDb(db)
-        return await this.mongo!.find(collection, query, opts) as T[]
+    async dbFind<T>(db: string, collection: string, query: Obj, opts: Obj = {}, mongo?: Mongo) {
+        const m = mongo ?? this.mongo
+        assert(m, 'missing Mongo instance')
+        m.setDb(db)
+        return await m.find(collection, query, opts) as T[]
     }
 
-    async dbUpdateById(db: string, collection: string, _id: string, update: Obj) {
-        this.mongo!.setDb(db)
-        return await this.mongo!.updateOne(collection, { _id }, update)
+    async dbUpdateById(db: string, collection: string, _id: string, update: Obj, mongo?: Mongo) {
+        const m = mongo ?? this.mongo
+        assert(m, 'missing Mongo instance')
+        m.setDb(db)
+        return await m.updateOne(collection, { _id }, update)
     }
 
-    async dbUpsert(db: string, collection: string, _id: string, update: Obj) {
-        this.mongo!.setDb(db)
-        return await this.mongo!.upsert(collection, { _id }, update)
+    async dbUpsert(db: string, collection: string, _id: string, update: Obj, mongo?: Mongo) {
+        const m = mongo ?? this.mongo
+        assert(m, 'missing Mongo instance')
+        m.setDb(db)
+        return await m.upsert(collection, { _id }, update)
     }
 
     async posljiSmsNarocenemu(data: Obj, n: { smsText: string, posiljatelj: string, narocen: Narocen, zaKdaj: Date }, gsm: string) {
@@ -1001,12 +1065,12 @@ export class KlikvetLogicWorker extends Worker {
             this.mongo!.setAudit({ tenant: data.tenant, app: "klikvet/razknjiziRacun" })
             await spremeniZalogoNaPodlagiRacuna(racun, nastavitve, this.mongo as any)
             await this.pobrisiZalogoNaDan(data.tenant, [racun.datum])
-            this.razknjizujem = false;
             return { ok: true }
         } catch (err) {
             console.error("razknjiziRacun", data.tenant, err?.message || err)
-            this.razknjizujem = false;
             return { ok: false, error: err?.message || err }
+        } finally {
+            this.razknjizujem = false;
         }
     }
 
@@ -1030,33 +1094,34 @@ export class KlikvetLogicWorker extends Worker {
         return await zdruziPaciente(data.iz, data.v, this.mongo!);
     }
 
-    async razknjiziRacune(data: { tenant: string }) {
+    async razknjiziRacune(data: { tenant: string }, mongo?: Mongo) {
         console.log('razkljižni račune');
         
         if (this.razknjizujem) return { ok: false, error: "worker že razknjižuje" };
         this.razknjizujem = true;
         try {
-            this.mongo!.setDb(data.tenant)
-            this.mongo!.setAudit({ tenant: data.tenant, app: "klikvet/razknjiziRacune" })
+            const m = mongo ?? this.mongo
+            assert(m, 'missing Mongo instance')
+            m.setDb(data.tenant)
+            m.setAudit({ tenant: data.tenant, app: "klikvet/razknjiziRacune" })
 
             let dni = 6 * 30 * 24 * 60 * 60 * 1000;     // 180 dni
-            console.log('dni',dni);
             
             let od = new Date(new Date().valueOf() - dni);
-            let racuni = await this.mongo!.find("racuni", {
+            let racuni = await m.find("racuni", {
                 datum: { $gte: od },
-                razknjizen: { $not: { $type: "date" } },
+                razknjizen: { $exist: false },
                 razknjizbaPreskocena: { $exists: false },
             }, {}) as RacunZaKnjizbo[] | undefined;
 
-            let nastavitve = await this.dbNastavitve(data.tenant);
+            let nastavitve = await this.dbNastavitve(data.tenant, m);
             let datumi = []
             for await (let racun of racuni || []) {
                 datumi.push(racun.datum)
-                await spremeniZalogoNaPodlagiRacuna(racun, nastavitve, this.mongo as any)
+                await spremeniZalogoNaPodlagiRacuna(racun, nastavitve, m as any)
                 console.log('z zamikom razknjižen račun št. ', racun.stevilka);
             }
-            await this.pobrisiZalogoNaDan(data.tenant, datumi)
+            await this.pobrisiZalogoNaDan(data.tenant, datumi, m)
             this.razknjizujem = false;
             return { ok: true, racuni }
 
@@ -1067,16 +1132,18 @@ export class KlikvetLogicWorker extends Worker {
         }
     }
 
-    async pobrisiZalogoNaDan(db: string, datumi: Date[]) {
+    async pobrisiZalogoNaDan(db: string, datumi: Date[], mongo?: Mongo) {
         try {
             if (!datumi) return;
             if (!Array.isArray(datumi)) datumi = []
             if (!datumi.length) return;
             let od = new Date(Math.min(...datumi.map(d => d.valueOf())) - 24 * 60 * 60 * 1000);
-            this.mongo!.setDb(db)
-            this.mongo!.setAudit({ tenant: db, app: "klikvet/pobrisiZalogoNaDan" })
+            const m = mongo ?? this.mongo
+            assert(m, 'missing Mongo instance')
+            m.setDb(db)
+            m.setAudit({ tenant: db, app: "klikvet/pobrisiZalogoNaDan" })
 
-            if (od.valueOf() > 0) await this.mongo!.hardDelete("zalogaNaDan", { datum: { $gte: od } });
+            if (od.valueOf() > 0) await m.hardDelete("zalogaNaDan", { datum: { $gte: od } });
             else console.log("pobrisiZalogoNaDan napačni datumi", datumi)
         } catch (err) {
             console.log("pobrisiZalogoNaDan error", err);
@@ -1103,52 +1170,70 @@ export class KlikvetLogicWorker extends Worker {
 
     }
 
-    async razknjiziBlagovnice(data: { tenant: string }) {
-        this.mongo!.emitPublishEvents(false);
-        this.mongo!.useAuditing(false)
-        this.mongo!.setDb(data.tenant);
-        this.mongo!.setAudit({ tenant: data.tenant, app: "klikvet/razknjiziBlagovnice" });
+    async razknjiziBlagovnice(data: { tenant: string }, mongo?: Mongo) {
+        if (this.razknjizujem) {
+            return { ok: false, vse: 0, razknjizene: 0, napake: ["Razknjiževanje že poteka."] };
+        }
+        const m = mongo ?? this.mongo
+        assert(m, 'missing Mongo instance')
+        m.emitPublishEvents(false);
+        m.useAuditing(false)
+        m.setDb(data.tenant);
+        m.setAudit({ tenant: data.tenant, app: "klikvet/razknjiziBlagovnice" });
 
         let od = new Date(new Date().valueOf() - 60 * 24 * 60 * 60 * 1000);
 
         // poišči tiste, ki bi morale že biti razknjižene, pa niso
         {
-            let od = new Date(new Date().valueOf() - 3 * 60 * 24 * 60 * 60 * 1000);
-            let vpisane = await this.dbFind<Blagovnica>(data.tenant, "blagovnice", { datum: { $gte: od } }, { project: { _id: 1, status: 1 } });
-            let idjiVpisanih = vpisane.map(b => b._id.toString());
+            let od = new Date(new Date().valueOf() - 3 * 60 * 24 * 60 * 60 * 1000); // zadnji trije meseci
+            let vpisane = await this.dbFind<Blagovnica>(data.tenant, "blagovnice", {
+                datum: { $gte: od },
+                razknjizena: { $exists: false },
+                razknjizbaPreskocena: { $exists: false },
 
-            let zaPovrnit = await this.dbFind<Blagovnica>(data.tenant, "odprteBlagovnice", { _deleted: { $ne: "hack" }, status: "zaključena", datum: { $gte: od }, _id: { $nin: idjiVpisanih } }, { project: { status: 1, dokumentDobavitelja: 1, vrsta: 1 } });
+            }, { project: { _id: 1, status: 1,razknjizena:1, razknjizbaPreskocena:1  } }, m);
+            let idjiVpisanih = vpisane.filter(b => !b.razknjizena && !b.razknjizbaPreskocena).map(b => b._id.toString());
+
+            let zaPovrnit = await this.dbFind<Blagovnica>(data.tenant, "odprteBlagovnice", {
+                _deleted: { $ne: "hack" },
+                status: "zaključena",
+                datum: { $gte: od },
+                _id: { $in: idjiVpisanih }
+            }, { project: { postavke: 0} }, m);
 
             for await (let b of zaPovrnit) {
                 console.log("vračam blagovnico v razkljižno", data.tenant, b)
-                await this.dbUpsert(data.tenant, "odprteBlagovnice", b._id, { razknjizena: undefined, _deleted: undefined, _vrnjenoVRazknjizbo: new Date() });
+                await this.dbUpsert(data.tenant, "odprteBlagovnice", b._id, { razknjizena: undefined, _deleted: undefined, _vrnjenoVRazknjizbo: new Date() }, m);
             }
         }
 
         let nerazknijzene = await this.dbFind<Dobavnica>(data.tenant, "odprteBlagovnice",
-            { datum: { $gte: od }, status: "zaključena", razknjizena: { $exists: false } },
-            { sort: { datum: 1 } }
+            { datum: { $gte: od }, status: "zaključena", razknjizena: { $exists: false }, razknjizbaPreskocena: { $exists: false } },
+            { sort: { datum: 1 } },
+            m
         );
         let vse = 0, razknjizene = 0
         let napake = []
-        for await (let dobavnica of nerazknijzene) {
+        for await (let blagovnica of nerazknijzene) {
             try {
                 vse++
-                await this.razknjiziBlagovnico(dobavnica._id.toString(), data.tenant)
+                await this.razknjiziBlagovnico(blagovnica._id.toString(), data.tenant, m)
                 razknjizene++
             } catch (err) {
-                napake.push(err)
+                napake.push(err instanceof Error ? err.message : String(err))
             }
         }
         return { ok: vse === razknjizene, vse, razknjizene, napake }
     }
 
-    async razknjiziDobavnice(data: { tenant: string }) {
+    async razknjiziDobavnice(data: { tenant: string }, mongo?: Mongo) {
 
-        this.mongo!.emitPublishEvents(false)
-        this.mongo!.useAuditing(false)
-        this.mongo!.setDb(data.tenant)
-        this.mongo!.setAudit({ tenant: data.tenant, app: "klikvet/razknjiziDobavnice" })
+        const m = mongo ?? this.mongo
+        assert(m, 'missing Mongo instance')
+        m.emitPublishEvents(false)
+        m.useAuditing(false)
+        m.setDb(data.tenant)
+        m.setAudit({ tenant: data.tenant, app: "klikvet/razknjiziDobavnice" })
 
         let od = new Date(new Date().valueOf() - 60 * 24 * 60 * 60 * 1000)
         let nerazknijzene = await this.dbFind<Dobavnica>(data.tenant, "dobavnice",
@@ -1157,17 +1242,18 @@ export class KlikvetLogicWorker extends Worker {
                 razknjizena: { $not: { $type: "date" } },
                 razknjizbaPreskocena: { $exists: false },
             },
-            { sort: { datum: 1 } }
+            { sort: { datum: 1 } },
+            m
         );
         let vse = 0, razknjizene = 0
         let napake = []
         for await (let blagovnica of nerazknijzene) {
             try {
                 vse++
-                await this.razknjiziDobavnico(blagovnica._id.toString(), data.tenant)
+                await this.razknjiziDobavnico(blagovnica._id.toString(), data.tenant, m)
                 razknjizene++
             } catch (err) {
-                napake.push(err)
+                napake.push(err instanceof Error ? err.message : String(err))
             }
         }
         return { ok: vse === razknjizene, vse, razknjizene, napake }
@@ -1193,47 +1279,56 @@ export class KlikvetLogicWorker extends Worker {
     //     await pobrisiZalogoNaDan(tenant, [ blagovnica.datum ]);
     // }
 
-    async razknjiziBlagovnico(_id: string, tenant: string) {
-
-        if (this.razknjizujem) return;
+    async razknjiziBlagovnico(_id: string, tenant: string, mongo?: Mongo) {
+        if (this.razknjizujem) {
+            throw new Error("worker že razknjižuje");
+        }
         this.razknjizujem = true;
         try {
-            this.mongo!.emitPublishEvents(false)
-            this.mongo!.useAuditing(false)
-            this.mongo!.setDb(tenant)
-            this.mongo!.setAudit({ tenant, app: "klikvet/razknjiziBlagovnico" })
-
-            let blagovnica = await razknjiziBlagovnico(_id, this.mongo as any);
-            this.razknjizujem = false;
-            return blagovnica
+            const m = mongo ?? this.mongo
+            assert(m, 'missing Mongo instance')
+            m.emitPublishEvents(false)
+            m.useAuditing(false)
+            m.setDb(tenant)
+            m.setAudit({ tenant, app: "klikvet/razknjiziBlagovnico" })
+
+            return await razknjiziBlagovnico(_id, m as any);
         } catch (err) {
-            console.error("razknjiziBlagovnico", tenant)
+            const message = err instanceof Error ? err.message : String(err)
+            console.error("razknjiziBlagovnico", tenant, message)
+            throw err instanceof Error ? err : new Error(message)
+        } finally {
+            this.razknjizujem = false;
         }
-        this.razknjizujem = false;
-        return undefined
     }
 
-    async razknjiziDobavnico(_id: string, tenant: string) {
-        if (this.razknjizujem) return;
+    async razknjiziDobavnico(_id: string, tenant: string, mongo?: Mongo) {
+        if (this.razknjizujem) {
+            throw new Error("worker že razknjižuje")
+        }
         this.razknjizujem = true;
         try {
-            this.mongo!.setDb(tenant)
-            this.mongo!.setAudit({ tenant, app: "klikvet/razknjiziDobavnico" })
-            let dobavnica = await razknjiziDobavnico(_id, this.mongo as any);
-            this.razknjizujem = false;
-            return dobavnica
+            const m = mongo ?? this.mongo
+            assert(m, 'missing Mongo instance')
+            m.setDb(tenant)
+            m.setAudit({ tenant, app: "klikvet/razknjiziDobavnico" })
+            return await razknjiziDobavnico(_id, m as any);
         } catch (err) {
-            console.error("razknjiziDobavnico", tenant, err?.message || err)
+            const message = err instanceof Error ? err.message : String(err)
+            console.error("razknjiziDobavnico", tenant, message)
+            throw err instanceof Error ? err : new Error(message)
+        } finally {
+            this.razknjizujem = false;
         }
-        this.razknjizujem = false;
-        return undefined
     }
 
-    async registerAllInvoices(data: { tenant: string, env: string, }) {
+    async registerAllInvoices(data: { tenant: string, env: string, }, mongo?: Mongo) {
         if (this.razknjizujem) return { nall: 0, nok: 0, napake: ["worker že razknjižuje"] };
         this.razknjizujem = true;
         try {
             assert(data.tenant, "must specify tenant")
+            const m = mongo ?? this.mongo
+            assert(m, 'missing Mongo instance')
 
             let err = null;
             let napake = new Set()
@@ -1241,19 +1336,19 @@ export class KlikvetLogicWorker extends Worker {
 
                 err = "Podsistem db ni dosegljiv."
 
-                this.mongo!.setDb(data.tenant)
-                this.mongo!.setAudit({ tenant: data.tenant, app: "klikvet/registerAllInvoices" })
+                m.setDb(data.tenant)
+                m.setAudit({ tenant: data.tenant, app: "klikvet/registerAllInvoices" })
 
                 let myquery = { eor: null, negotovinski: { $ne: true }, leto: { $gte: 2022 } };
-                let env = data.env || (await this.mongo!.findOne<Nastavitve>("nastavitve", {}))?.okolje || "error"
+                let env = data.env || (await m.findOne<Nastavitve>("nastavitve", {}))?.okolje || "error"
 
-                let all = await this.mongo!.find<Racun>("racuni", myquery, { project: { _id: 1 }, limit: 1000, })
+                let all = await m.find<Racun>("racuni", myquery, { project: { _id: 1 }, limit: 1000, })
                 err = "Napaka pri potrjevanju računov."
 
                 let n = 0;
                 try {
                     for await (let r of all) {
-                        let res = await this.registerInvoice({ tenant: data.tenant, env, _id: r._id.toString() }, true);
+                        let res = await this.registerInvoice({ tenant: data.tenant, env, _id: r._id.toString() }, true, m);
                         if (res instanceof Error || typeof res === "string") {
                             console.error("cannot register invoice (1)", data.tenant, r._id, res)
                         } else {
@@ -1294,8 +1389,10 @@ export class KlikvetLogicWorker extends Worker {
         return res
     }
 
-    async registerInvoice(data: { env: string, tenant: string, _id: string }, kasneje = false) {
-        this.mongo!.setAudit({ tenant: data.tenant, app: "klikvet/registerInvoice" })
+    async registerInvoice(data: { env: string, tenant: string, _id: string }, kasneje = false, mongo?: Mongo) {
+        const db = mongo ?? this.mongo
+        assert(db, 'missing Mongo instance')
+        db.setAudit({ tenant: data.tenant, app: "klikvet/registerInvoice" })
 
         assert(data._id, "must specify _id of racun")
         assert(["error", "production", "test"].includes(data.env), "must specify env")
@@ -1305,15 +1402,15 @@ export class KlikvetLogicWorker extends Worker {
         try {
             // poišči račun
             timeoutError = "Db podsistem se ni odzval."
-            let racun = await this.dbFindById<Racun>(data.tenant, "racuni", data._id)
+            let racun = await this.dbFindById<Racun>(data.tenant, "racuni", data._id, db)
             if (!racun) return `registerInvoice for ${data.tenant}: ni računa ${data._id}`
             if (racun.negotovinski) return "negotovinski račun ne bo fiskaliziran";
 
-            let blagajna = await this.dbFindById<Blagajna>(data.tenant, "blagajne", racun.blagajna_id)
+            let blagajna = await this.dbFindById<Blagajna>(data.tenant, "blagajne", racun.blagajna_id, db)
             if (!blagajna) throw new Error("cannot locate blagajna: " + racun.blagajna_id)
-            let poslovalnica = await this.dbFindById<Poslovalnica>(data.tenant, "poslovalnice", blagajna.poslovalnica_id)
+            let poslovalnica = await this.dbFindById<Poslovalnica>(data.tenant, "poslovalnice", blagajna.poslovalnica_id, db)
             if (!blagajna) throw new Error("cannot locate poslovalnica: " + racun.blagajna_id)
-            let veterina = await this.dbFindById<Nastavitve>(data.tenant, "nastavitve", poslovalnica.veterina_id)
+            let veterina = await this.dbFindById<Nastavitve>(data.tenant, "nastavitve", poslovalnica.veterina_id, db)
             if (!veterina) throw new Error("cannot locate poslovalnica: " + poslovalnica.veterina_id)
             if (!racun.izdalDs) throw new Error("Uporabnik verjetno nima vpisane davčne številke.")
 
@@ -1325,7 +1422,7 @@ export class KlikvetLogicWorker extends Worker {
                         datum: racun.datum,
                         stevilka: racun.stevilka,
                     }
-                })
+                }, db)
             }
 
             let TaxNumber = (veterina.dsCertifikata || veterina.davcnaStevilka)
@@ -1453,11 +1550,11 @@ export class KlikvetLogicWorker extends Worker {
 
             // posodobi račun
             timeoutError = "Napaka pri vpisu davčno potrjenega računa: Db podsistem se ne odziva več."
-            let updated = await this.dbUpdateById(data.tenant, "racuni", data._id, fursObj);
+            let updated = await this.dbUpdateById(data.tenant, "racuni", data._id, fursObj, db);
 
             try {
                 let dir = path.join('./racuni', new Date().getFullYear().toString(), data.tenant)
-                !fs.existsSync(dir) && makeDir.sync(dir);
+                !fs.existsSync(dir) && makeDirectorySync(dir);
                 fs.writeFileSync(path.join(dir, racun.stevilka), serialize.pack(clonedeep({ ...racun, ...updated }), false));
             } catch (err) {
                 console.log("napaka pri zapisu izdanega računa na disk", err)