Додана сторінка "Розклад зібрань"

Перероблен генератор карточок територій APІ
2025-11-22 20:17:50 +02:00
parent 04f39da611
commit 4b96ef0806
50 changed files with 1486 additions and 494 deletions
--- a/api/Dockerfile
+++ b/api/Dockerfile
@@ -8,6 +8,8 @@ RUN npm install

 RUN apt-get update

+RUN apt-get update && apt-get install -y chromium
+
 COPY . .

 EXPOSE 4000
--- a/api/middleware/genCards.js
+++ b/api/middleware/genCards.js
@@ -1,77 +1,58 @@
-const path = require('path');
+const os = require('os');
 const fs = require('fs');
-const puppeteer = require('puppeteer');
+const path = require('path');
+const { chromium } = require('playwright');
 const sharp = require('sharp');

 const DIR = process.env.CARDS_PATH || '../cards';

-async function genCards({ center, type, wayId, zoom, number, address }) {
-    const browser = await puppeteer.launch({
+async function genCards({ id, type }) {
+    if (!process.env.DOMAIN) throw new Error("❌ DOMAIN не заданий у .env");
+    if (!process.env.ADMIN_TOKEN) throw new Error("❌ ADMIN_TOKEN не заданий у .env");
+    if (!process.env.CARDS_PATH) throw new Error("❌ CARDS_PATH не заданий у .env");
+
+
+    const name = type == 'homestead' ? `H${id}` : `T${id}`
+
+    const URL = `https://${process.env.DOMAIN}/api/${type}/${id}`; // Замени на свой URL
+    const AUTH_TOKEN = process.env.ADMIN_TOKEN;
+    const DIR = process.env.CARDS_PATH || '../cards';
+    const SCREENSHOT_FILE = path.resolve(`${DIR}/cache/${type}/${name}.png`);
+    const OUTPUT_FILE = path.resolve(`${DIR}/${type}/${name}.webp`);
+
+
+    // --- Отримуємо дані ---
+    const res = await fetch(URL, {
+        headers: { 'Authorization': AUTH_TOKEN, 'Accept': 'application/json' }
+    });
+    if (!res.ok) throw new Error(`Помилка запиту: ${res.status}`);
+    const data = await res.json();
+
+    // --- Генеруємо HTML ---
+    const html = `<!DOCTYPE html><html><head><meta charset="UTF-8" /><link rel="stylesheet" href="https://sheep-service.com/lib/components/leaflet/leaflet.css" /><script src="https://sheep-service.com/lib/components/leaflet/leaflet.js"></script><script src="https://sheep-service.com/lib/components/qrcode.min.js"></script><style>@import url("https://fonts.googleapis.com/css2?family=Roboto:wght@300;400;500;700&display=swap");html, body {height: calc(100% + 50px);}* {border: 0;padding: 0;font-family: "Roboto", sans-serif;margin: 0;font-weight: 500;outline: none;}#content {width: 100%;height: 100%;position: absolute;z-index: 9999;display: flex;flex-direction: column;}#content > #title {width: calc(100% - 30px);min-height: 90px;background: rgb(255 255 255 / 51%);backdrop-filter: blur(10px);display: flex;flex-direction: row;justify-content: space-between;padding: 15px;align-items: center;color: #333;}#content > #title > div {display: flex;flex-direction: column;width: 100%;align-items: center;}#content > #title > h1 {font-size: 60px;font-weight: 700;margin: 0;min-width: 200px;text-align: center;}#content > #title > div > h2 {font-size: 35px;font-weight: 700;margin: 0;}#content > #title > div > h3 {font-size: 28px;font-weight: 500;margin: 0px 0 10px 0;}#qrcode {position: absolute;bottom: 20px;left: 20px;width: 100px;height: 100px;background: #fff;padding: 10px;border-radius: 2px;}.line-left {position: absolute;left: 0;top: 120px;width: 10px;height: calc(100% - 120px);background: rgb(255 255 255 / 51%);backdrop-filter: blur(10px);}.line-right {position: absolute;right: 0;top: 120px;width: 10px;height: calc(100% - 120px);background: rgb(255 255 255 / 51%);backdrop-filter: blur(10px);}.line-bottom {position: absolute;left: 10px;bottom: 0;width: calc(100% - 20px);height: 10px;background: rgb(255 255 255 / 51%);backdrop-filter: blur(10px);}#map {width: 100%;height: 100%;}</style></head><body><div id="content"><div id="title"><div><h3>Картка плану території</h3><h2 id="address"></h2></div><h1 id="number"></h1></div><div id="qrcode"></div><div class="line-left"></div><div class="line-right"></div><div class="line-bottom"></div></div><div id="map"></div><script>const urlParams = new URLSearchParams(window.location.search);let coordinates = ${JSON.stringify(data.points)};let center = [${data.geo.lat}, ${data.geo.lng}];let zoom = ${data.zoom};let type = "${type}";let address = "${data.title} ${data.number ?? ""}";let osm = L.tileLayer("http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",{});let mytile = L.tileLayer("https://sheep-service.com/map/{z}/{x}/{y}.webp",{maxZoom: 20,minZoom: 15,tms: true,});let map = L.map("map", {renderer: L.canvas(),center,zoom,zoomControl: false,layers: [osm, mytile],});let baseMaps = {OpenStreetMap: osm,"Sheep Service Map": mytile,};let polygonOptions =type === "homestead"? {color: "#f2bd53",radius: 500,fillOpacity: 0.3,dashArray: "20,15",dashOffset: "20",}: {color: "#585858",fillColor: "#f2bd53",fillOpacity: 0.8,};window.onload = async function () {let polygon = L.polygon(coordinates, polygonOptions).addTo(map);let text = 'https://www.google.com/maps/search/?api=1&query='+center[0]+','+center[1];new QRCode(document.getElementById("qrcode"), {text: text,width: 100,height: 100,correctLevel: QRCode.CorrectLevel.L,version: 5,});document.getElementById("address").innerText = address;document.getElementById("number").innerText = '${name}';};</script></body></html>`;
+
+    // --- Зберігаємо тимчасовий HTML ---
+    const tmpFile = path.join(os.tmpdir(), 'map.html');
+    fs.writeFileSync(tmpFile, html, 'utf-8');
+
+    // --- Зберігаємо ---
+    // const browser = await chromium.launch();
+    const browser = await chromium.launch({
        executablePath: process.env.PUPPETEER_EXECUTABLE_PATH || '/usr/bin/chromium-browser',
        args: ['--no-sandbox', '--disable-setuid-sandbox']
    });
-
-
-    let latlng = center && center.lat && center.lng ? `lat=${center.lat}&lng=${center.lng}&` : '';
-
-    const page = await browser.newPage();
-    await page.setViewport({ width: 1144, height: (750 + 140) })
-    await page.goto(`https://sheep-service.com/screenshot.html?${latlng}type=${type}&wayId=${wayId}&zoom=${zoom}&address=${address}&number=${number}`, { timeout: 0 });
-    await page.waitForSelector('.leaflet-tile-loaded', { timeout: 30000 });
-    await new Promise(resolve => setTimeout(resolve, 1000));
-
-    let name = () => {
-        if (type == "house") return `T${number}.png`
-        else if (type == "entrance") return `E${number}.png`
-        else if (type == "homestead") return `H${number}.png`
-        return `${Date.now()}.png`
-    }
-
-    if (!fs.existsSync(path.join(DIR, 'cache'))) {
-        fs.mkdirSync(path.join(DIR, 'cache'), { recursive: true })
-    }
-
-    await page.screenshot({ path: path.join(DIR, "cache", name()) });
-
+    const page = await browser.newPage({ viewport: { width: 811, height: 531 } });
+    await page.goto(`file://${tmpFile}`);
+    await page.waitForTimeout(2000); // пауза 1 секунда для провантаження карти
+    await page.screenshot({ path: SCREENSHOT_FILE });
    await browser.close();

-    return name();
+    await sharp(SCREENSHOT_FILE)
+        .webp()
+        .toFile(OUTPUT_FILE);
+
+    console.log(`Зображеня збережене: ${name}.png`);
+    // return fs.existsSync(OUTPUT_FILE);
 }

-async function saveCards({ center, type, wayId, zoom, number, address }) {
-    let name = await genCards({ center, type, wayId, zoom, number, address });
-
-    if (!fs.existsSync(path.join(DIR, type))) {
-        fs.mkdirSync(path.join(DIR, type), { recursive: true });
-    }
-
-    try {
-        const metadata = await sharp(path.join(DIR, 'cache', name)).metadata();
-        const width = metadata.width;
-        const height = metadata.height;
-
-        if (width > 20 && height > 140) {
-            const outputPath = path.join(DIR, type, name.replace(path.extname(name), '.webp'));
-
-            await sharp(path.join(DIR, 'cache', name))
-                .extract({
-                    left: 0,
-                    top: 0,
-                    width: width,
-                    height: height - 140
-                })
-                .webp()
-                .toFile(outputPath);
-
-            return fs.existsSync(outputPath);
-        } else {
-            console.error('Изображение слишком маленькое для обрезки!');
-            return false;
-        }
-    } catch (err) {
-        console.error('Ошибка при обработке изображения:', err);
-        return false;
-    }
-}
-
-module.exports = saveCards;
+module.exports = genCards;
--- a/api/package-lock.json
+++ b/api/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "API Sheep Service",
-  "version": "2.0.1",
+  "version": "2.0.5",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "API Sheep Service",
-      "version": "2.0.1",
+      "version": "2.0.5",
      "license": "ISC",
      "dependencies": {
        "cors": "^2.8.5",
@@ -14,7 +14,7 @@
        "exceljs": "^4.4.0",
        "express": "^4.21.0",
        "node-telegram-bot-api": "^0.66.0",
-        "pg": "^8.16.3",
+        "playwright": "^1.56.1",
        "puppeteer": "^24.4.0",
        "sharp": "^0.33.5",
        "sqlite3": "^5.1.7",
@@ -2362,6 +2362,19 @@
      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
    },
+    "node_modules/fsevents": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
    "node_modules/fstream": {
      "version": "1.0.12",
      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
@@ -4252,92 +4265,39 @@
      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
      "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow=="
    },
-    "node_modules/pg": {
-      "version": "8.16.3",
-      "resolved": "https://registry.npmjs.org/pg/-/pg-8.16.3.tgz",
-      "integrity": "sha512-enxc1h0jA/aq5oSDMvqyW3q89ra6XIIDZgCX9vkMrnz5DFTw/Ny3Li2lFQ+pt3L6MCgm/5o2o8HW9hiJji+xvw==",
-      "dependencies": {
-        "pg-connection-string": "^2.9.1",
-        "pg-pool": "^3.10.1",
-        "pg-protocol": "^1.10.3",
-        "pg-types": "2.2.0",
-        "pgpass": "1.0.5"
-      },
-      "engines": {
-        "node": ">= 16.0.0"
-      },
-      "optionalDependencies": {
-        "pg-cloudflare": "^1.2.7"
-      },
-      "peerDependencies": {
-        "pg-native": ">=3.0.1"
-      },
-      "peerDependenciesMeta": {
-        "pg-native": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/pg-cloudflare": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/pg-cloudflare/-/pg-cloudflare-1.2.7.tgz",
-      "integrity": "sha512-YgCtzMH0ptvZJslLM1ffsY4EuGaU0cx4XSdXLRFae8bPP4dS5xL1tNB3k2o/N64cHJpwU7dxKli/nZ2lUa5fLg==",
-      "optional": true
-    },
-    "node_modules/pg-connection-string": {
-      "version": "2.9.1",
-      "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.9.1.tgz",
-      "integrity": "sha512-nkc6NpDcvPVpZXxrreI/FOtX3XemeLl8E0qFr6F2Lrm/I8WOnaWNhIPK2Z7OHpw7gh5XJThi6j6ppgNoaT1w4w=="
-    },
-    "node_modules/pg-int8": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz",
-      "integrity": "sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==",
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/pg-pool": {
-      "version": "3.10.1",
-      "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.10.1.tgz",
-      "integrity": "sha512-Tu8jMlcX+9d8+QVzKIvM/uJtp07PKr82IUOYEphaWcoBhIYkoHpLXN3qO59nAI11ripznDsEzEv8nUxBVWajGg==",
-      "peerDependencies": {
-        "pg": ">=8.0"
-      }
-    },
-    "node_modules/pg-protocol": {
-      "version": "1.10.3",
-      "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.10.3.tgz",
-      "integrity": "sha512-6DIBgBQaTKDJyxnXaLiLR8wBpQQcGWuAESkRBX/t6OwA8YsqP+iVSiond2EDy6Y/dsGk8rh/jtax3js5NeV7JQ=="
-    },
-    "node_modules/pg-types": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/pg-types/-/pg-types-2.2.0.tgz",
-      "integrity": "sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==",
-      "dependencies": {
-        "pg-int8": "1.0.1",
-        "postgres-array": "~2.0.0",
-        "postgres-bytea": "~1.0.0",
-        "postgres-date": "~1.0.4",
-        "postgres-interval": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/pgpass": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/pgpass/-/pgpass-1.0.5.tgz",
-      "integrity": "sha512-FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug==",
-      "dependencies": {
-        "split2": "^4.1.0"
-      }
-    },
    "node_modules/picocolors": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="
    },
+    "node_modules/playwright": {
+      "version": "1.56.1",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.56.1.tgz",
+      "integrity": "sha512-aFi5B0WovBHTEvpM3DzXTUaeN6eN0qWnTkKx4NQaH4Wvcmc153PdaY2UBdSYKaGYw+UyWXSVyxDUg5DoPEttjw==",
+      "dependencies": {
+        "playwright-core": "1.56.1"
+      },
+      "bin": {
+        "playwright": "cli.js"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "optionalDependencies": {
+        "fsevents": "2.3.2"
+      }
+    },
+    "node_modules/playwright-core": {
+      "version": "1.56.1",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.56.1.tgz",
+      "integrity": "sha512-hutraynyn31F+Bifme+Ps9Vq59hKuUCz7H1kDOcBs+2oGguKkWTU50bBWrtz34OUWmIwpBTWDxaRPXrIXkgvmQ==",
+      "bin": {
+        "playwright-core": "cli.js"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
    "node_modules/possible-typed-array-names": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz",
@@ -4346,41 +4306,6 @@
        "node": ">= 0.4"
      }
    },
-    "node_modules/postgres-array": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz",
-      "integrity": "sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/postgres-bytea": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz",
-      "integrity": "sha512-xy3pmLuQqRBZBXDULy7KbaitYqLcmxigw14Q5sj8QBVLqEwXfeybIKVWiqAXTlcvdvb0+xkOtDbfQMOf4lST1w==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postgres-date": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz",
-      "integrity": "sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postgres-interval": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz",
-      "integrity": "sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==",
-      "dependencies": {
-        "xtend": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
    "node_modules/prebuild-install": {
      "version": "7.1.3",
      "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.3.tgz",
@@ -5345,14 +5270,6 @@
        "node": ">=0.10.0"
      }
    },
-    "node_modules/split2": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz",
-      "integrity": "sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==",
-      "engines": {
-        "node": ">= 10.x"
-      }
-    },
    "node_modules/sqlite3": {
      "version": "5.1.7",
      "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-5.1.7.tgz",
@@ -6132,14 +6049,6 @@
      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw=="
    },
-    "node_modules/xtend": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
-      "engines": {
-        "node": ">=0.4"
-      }
-    },
    "node_modules/y18n": {
      "version": "5.0.8",
      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
--- a/api/package.json
+++ b/api/package.json
@@ -1,6 +1,6 @@
 {
  "name": "API Sheep Service",
-  "version": "2.0.1",
+  "version": "2.0.5",
  "main": "app.js",
  "scripts": {
    "start": "node app.js"
@@ -14,6 +14,7 @@
    "exceljs": "^4.4.0",
    "express": "^4.21.0",
    "node-telegram-bot-api": "^0.66.0",
+    "playwright": "^1.56.1",
    "puppeteer": "^24.4.0",
    "sharp": "^0.33.5",
    "sqlite3": "^5.1.7",
--- a/api/services/constructor.service.js
+++ b/api/services/constructor.service.js
@@ -1,204 +1,7 @@
 const db = require("../config/db");
-const saveCards = require("../middleware/genCards");
+const genCards = require("../middleware/genCards");

 class ConstructorService {
-    // createPack(data) {
-    //     return new Promise((res, rej) => {
-    //         let sql = `
-    //             INSERT INTO 
-    //                 house(
-    //                 group_id,
-    //                 title,
-    //                 number,
-    //                 points,
-    //                 points_number,
-    //                 geo,
-    //                 osm_id,
-    //                 settlement,
-    //                 created_at
-    //                 ) 
-    //             VALUES 
-    //                 (?, ?, ?, ?, ?, ?, ?, ?, ?)
-    //         `;
-
-    //         db.run(sql, [
-    //             Number(data.house.group_id),
-    //             data.house.title,
-    //             data.house.number,
-    //             JSON.stringify(data.house.points),
-    //             JSON.stringify(data.house.points_number),
-    //             JSON.stringify(data.house.geo),
-    //             JSON.stringify(data.house.osm_id),
-    //             data.house.settlement,
-    //             Math.floor(Date.now())
-    //         ], function (err) {
-    //             if (err) {
-    //                 console.error(err.message);
-    //                 return res(false);
-    //             } else if (this.changes === 0) {
-    //                 return res(false);
-    //             } else {
-    //                 const houseId = this.lastID;
-
-    //                 const entranceStmt = db.prepare(`
-    //                     INSERT INTO 
-    //                         entrance(
-    //                             house_id, 
-    //                             entrance_number, 
-    //                             title, 
-    //                             points, 
-    //                             points_number, 
-    //                             created_at
-    //                         ) 
-    //                     VALUES 
-    //                         (?, ?, ?, ?, ?, ?)`);
-
-    //                 const apartmentStmt = db.prepare(`
-    //                     INSERT INTO 
-    //                         apartments(
-    //                             entrance_id, 
-    //                             apartment_number, 
-    //                             floors_number, 
-    //                             updated_at
-    //                         ) 
-    //                     VALUES 
-    //                         (?, ?, ?, ?)`);
-
-    //                 data.entrance.forEach((e, index) => {
-    //                     entranceStmt.run(
-    //                         houseId,
-    //                         Number(e.entrance_number),
-    //                         e.title,
-    //                         JSON.stringify(e.points),
-    //                         JSON.stringify(e.points_number),
-    //                         Math.floor(Date.now()),
-    //                         function (err) {
-    //                             if (err) {
-    //                                 console.error(err.message);
-    //                                 return;
-    //                             }
-    //                             const entranceId = this.lastID;
-
-    //                             if (data.apartments[e.editor_id]) {
-    //                                 data.apartments[e.editor_id].forEach(apartment => {
-    //                                     apartmentStmt.run(
-    //                                         entranceId,
-    //                                         apartment.apartment_number,
-    //                                         apartment.floors_number,
-    //                                         Math.floor(Date.now())
-    //                                     );
-    //                                 });
-    //                             }
-    //                         }
-    //                     );
-    //                 });
-
-    //                 entranceStmt.finalize();
-    //                 apartmentStmt.finalize();
-
-    //                 // res({ "status": "ok", "id": houseId });
-    //             }
-    //         });
-    //     });
-    // }
-
-    // createPack(data) {
-    //     return new Promise((res, rej) => {
-
-    //         if (data.type == "house") {
-    //             const sql = `
-    //                 INSERT INTO house (
-    //                     title, number, points, points_number, geo, osm_id, settlement, created_at
-    //                 ) VALUES (?, ?, ?, ?, ?, ?, ?, ?)`;
-
-    //             db.run(sql, [
-    //                 data.title,
-    //                 data.number,
-    //                 JSON.stringify(data.points),
-    //                 JSON.stringify(data.points_number),
-    //                 JSON.stringify(data.geo),
-    //                 JSON.stringify(data.osm_id),
-    //                 data.settlement,
-    //                 Math.floor(Date.now())
-    //             ], function (err) {
-    //                 if (err) {
-    //                     console.error(err.message);
-    //                     return res(false);
-    //                 }
-    //                 if (this.changes === 0) {
-    //                     return res(false);
-    //                 }
-
-    //                 const houseId = this.lastID;
-
-    //                 saveCards({ center: data.geo, wayId: data.osm_id, zoom: data.zoom ?? 18, type: "house", number: houseId, address: `${data.title} ${data.number}` });
-
-
-    //                 const entranceStmt = db.prepare(`
-    //                     INSERT INTO entrance (
-    //                         house_id, entrance_number, title, points, points_number, created_at
-    //                     ) VALUES (?, ?, ?, ?, ?, ?)`);
-
-    //                 const apartmentStmt = db.prepare(`
-    //                     INSERT INTO apartments (
-    //                         entrance_id, apartment_number, title, floors_number
-    //                     ) VALUES (?, ?, ?, ?)`);
-
-    //                 const entranceIdMap = {}; // Для сопоставления editor_id → entrance_id
-
-    //                 let pendingEntrances = data.entrance.length;
-
-    //                 data.entrance.forEach((e) => {
-    //                     entranceStmt.run(
-    //                         houseId,
-    //                         Number(e.entrance_number),
-    //                         e.title,
-    //                         JSON.stringify(e.points),
-    //                         JSON.stringify(e.points_number),
-    //                         Math.floor(Date.now()),
-    //                         function (err) {
-    //                             if (err) {
-    //                                 console.error(err.message);
-    //                                 return;
-    //                             }
-    //                             const entranceId = this.lastID;
-    //                             entranceIdMap[e.editor_id] = entranceId;
-
-    //                             if (--pendingEntrances === 0) {
-    //                                 insertApartments();
-    //                             }
-    //                         }
-    //                     );
-    //                 });
-
-    //                 function insertApartments() {
-    //                     for (const [editor_id, apartments] of Object.entries(data.apartments)) {
-    //                         const entranceId = entranceIdMap[editor_id];
-    //                         if (!entranceId) continue;
-
-    //                         apartments.forEach(apartment => {
-    //                             apartmentStmt.run(
-    //                                 entranceId,
-    //                                 Number(apartment.apartment_number),
-    //                                 apartment.title,
-    //                                 apartment.floors_number
-    //                             );
-    //                         });
-    //                     }
-
-    //                     entranceStmt.finalize();
-    //                     apartmentStmt.finalize();
-    //                     res({ "status": "ok", "id": houseId });
-    //                 }
-    //             });
-    //         } else if (data.type == "homestead") {
-    //             return res(false);
-    //         } else {
-    //             return res(false);
-    //         }
-    //     });
-    // }
-
    createPack(data) {
        return new Promise((res, rej) => {

@@ -228,8 +31,6 @@ class ConstructorService {

                    const houseId = this.lastID;

-                    // saveCards({ center: data.geo, wayId: data.osm_id, zoom: data.zoom ?? 18, type: "house", number: houseId, address: `${data.title} ${data.number}` });
-
                    const entranceStmt = db.prepare(`
                        INSERT INTO entrance (
                            house_id, entrance_number, title, created_at
@@ -287,6 +88,8 @@ class ConstructorService {
                        );
                    });

+                    genCards({type: "house", id: houseId});
+
                    function finalize() {
                        entranceStmt.finalize();
                        apartmentStmt.finalize();
@@ -321,8 +124,6 @@ class ConstructorService {

                    const homesteadId = this.lastID;

-                    // saveCards({ center: data.geo, wayId: data.osm_id, zoom: data.zoom ?? 17, type: "homestead", number: homesteadId, address: `${data.title} ${data.number}` });
-
                    const buildingStmt = db.prepare(`
                        INSERT INTO buildings (
                            homestead_id, title, geo
@@ -351,6 +152,8 @@ class ConstructorService {
                        );
                    });

+                    genCards({type: "homestead", id: homesteadId});
+
                    function finalize() {
                        buildingStmt.finalize();
                        res({ status: "ok", id: homesteadId });
--- a/api/services/stand.service.js
+++ b/api/services/stand.service.js
@@ -272,11 +272,11 @@ class StandService {
                                console.error(err.message);
                                return res(false);
                            }
-                            // Notification.sendStand({
-                            //     title: "Додан новий день служіння",
-                            //     body: `Стенд «${stand.title}» поповнився, встигніть записатися.`,
-                            //     page: `/stand/card/${stand.id}`
-                            // });
+                            Notification.sendStand({
+                                title: "Додан новий день служіння",
+                                body: `Стенд «${stand.title}» поповнився, встигніть записатися.`,
+                                page: `/stand/card/${stand.id}`
+                            });

                            res({ status: "ok", inserted: list.length });
                        });