remove sqlite

ssortia · ssortia · commit 6e09dc8c0856 · 2025-05-14T11:16:52.000+03:00
diff --git a/.gitignore b/.gitignore
@@ -103,4 +103,3 @@ typings/
 /documents/dossier
 
 package-lock.json
-sqlite.db
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ilb/classifiercomponent",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "description": "",
   "main": "src/index.js",
   "scripts": {
@@ -60,8 +60,6 @@
     "semantic-ui-css": "^2.4.1",
     "semantic-ui-react": "^2.1.3",
     "sharp": "^0.29.3",
-    "sqlite": "^4.2.1",
-    "sqlite3": "^5.1.7",
     "swr": "^1.3.0",
     "uuid": "^8.3.2"
   }
diff --git a/src/classifier/server/usecases/AddPages.mjs b/src/classifier/server/usecases/AddPages.mjs
@@ -13,11 +13,11 @@ import DocumentPathService from '../../../services/DocumentPathService.mjs';
 export default class AddPages {
   /**
    * @param {DossierBuilder} dossierBuilder
-   * @param sqliteDbPath
+   * @param {DocumentPathRepository} documentPathRepository
    */
-  constructor({ dossierBuilder, sqliteDbPath }) {
+  constructor({ dossierBuilder, documentPathRepository }) {
     this.dossierBuilder = dossierBuilder;
-    this.documentPathService = new DocumentPathService(sqliteDbPath);
+    this.documentPathService = new DocumentPathService({ documentPathRepository });
   }
 
   /**
diff --git a/src/classifier/server/usecases/ClassifyPages.mjs b/src/classifier/server/usecases/ClassifyPages.mjs
@@ -11,23 +11,23 @@ export default class ClassifyPages {
    * @param {DossierBuilder} dossierBuilder
    * @param {any} verificationService
    * @param {VerificationRepository} verificationRepository
+   * @param {DocumentPathRepository} documentPathRepository
    * @param classifierQuantity
-   * @param {string} sqliteDbPath
    */
   constructor({
     dossierBuilder,
     verificationService,
     verificationRepository,
     classifierQuantity,
-    sqliteDbPath
+    documentPathRepository
   }) {
     this.dossierBuilder = dossierBuilder;
     this.verificationService = verificationService;
     this.classifierGate = new ClassifierGate();
     this.documentService = new DocumentService(dossierBuilder);
     this.verificationRepository = verificationRepository;
     this.classifierQuantity = classifierQuantity;
-    this.documentPathService = new DocumentPathService(sqliteDbPath);
+    this.documentPathService = new DocumentPathService({ documentPathRepository });
     // concurrency = 1 чтобы страницы отправлялись на распознавание последовательно,
     // так как для распознавания требуется класс предыдущей распознанной страницы
     this.queue = queue;
diff --git a/src/classifier/server/usecases/CorrectPages.mjs b/src/classifier/server/usecases/CorrectPages.mjs
@@ -7,12 +7,12 @@ import DocumentPathService from '../../../services/DocumentPathService.mjs';
 export default class CorrectPages {
   /**
    * @param {DossierBuilder} dossierBuilder
-   * @param sqliteDbPath
+   * @param {DocumentPathRepository} documentPathRepository
    */
-  constructor({ dossierBuilder, sqliteDbPath }) {
+  constructor({ dossierBuilder, documentPathRepository }) {
     this.documentService = new DocumentService(dossierBuilder);
     this.dossierBuilder = dossierBuilder;
-    this.documentPathService = new DocumentPathService(sqliteDbPath);
+    this.documentPathService = new DocumentPathService({ documentPathRepository });
   }
 
   /**
diff --git a/src/classifier/server/usecases/DeletePage.mjs b/src/classifier/server/usecases/DeletePage.mjs
@@ -6,11 +6,11 @@ import DocumentPathService from '../../../services/DocumentPathService.mjs';
 export default class DeletePage {
   /**
    * @param {DossierBuilder} dossierBuilder
-   * @param sqliteDbPath
+   * @param {DocumentPathRepository} documentPathRepository
    */
-  constructor({ dossierBuilder, sqliteDbPath }) {
+  constructor({ dossierBuilder, documentPathRepository }) {
     this.dossierBuilder = dossierBuilder;
-    this.documentPathService = new DocumentPathService(sqliteDbPath);
+    this.documentPathService = new DocumentPathService({ documentPathRepository });
   }
 
   /**
diff --git a/src/classifier/server/usecases/GetDocument.mjs b/src/classifier/server/usecases/GetDocument.mjs
@@ -3,11 +3,11 @@ import DocumentPathService from '../../../services/DocumentPathService.mjs';
 export default class GetDocument {
   /**
    * @param {DossierBuilder} dossierBuilder
-   * @param {string} sqliteDbPath
+   * @param {DocumentPathRepository} documentPathRepository
    */
-  constructor({ dossierBuilder, sqliteDbPath }) {
+  constructor({ dossierBuilder, documentPathRepository }) {
     this.dossierBuilder = dossierBuilder;
-    this.documentPathService = new DocumentPathService(sqliteDbPath);
+    this.documentPathService = new DocumentPathService({ documentPathRepository });
   }
 
   async process({ uuid, name }) {
diff --git a/src/classifier/server/usecases/GetDocuments.mjs b/src/classifier/server/usecases/GetDocuments.mjs
@@ -7,10 +7,11 @@ import DocumentPathService from '../../../services/DocumentPathService.mjs';
 export default class GetDocuments {
   /**
    * @param {DossierBuilder} dossierBuilder
+   * @param {DocumentPathRepository} documentPathRepository
    */
-  constructor({ dossierBuilder, sqliteDbPath }) {
+  constructor({ dossierBuilder, documentPathRepository }) {
     this.dossierBuilder = dossierBuilder;
-    this.documentPathService = new DocumentPathService(sqliteDbPath);
+    this.documentPathService = new DocumentPathService({ documentPathRepository });
   }
 
   /**
diff --git a/src/classifier/server/usecases/GetPage.mjs b/src/classifier/server/usecases/GetPage.mjs
@@ -4,11 +4,11 @@ import DocumentPathService from '../../../services/DocumentPathService.mjs';
 export default class GetPage {
   /**
    * @param {DossierBuilder} dossierBuilder
-   * @param {string} sqliteDbPath
+   * @param {DocumentPathRepository} documentPathRepository
    */
-  constructor({ dossierBuilder, sqliteDbPath }) {
+  constructor({ dossierBuilder, documentPathRepository }) {
     this.dossierBuilder = dossierBuilder;
-    this.documentPathService = new DocumentPathService(sqliteDbPath);
+    this.documentPathService = new DocumentPathService({ documentPathRepository });
   }
 
   async process({ uuid, name, number }) {
diff --git a/src/di/container.mjs b/src/di/container.mjs
@@ -4,6 +4,7 @@ import { appConfig } from '../config/config.mjs';
 import FileService from '../services/FileService.mjs';
 import DocumentService from '../classifier/server/core/DocumentService.mjs';
 import mockRegistry from '../mocks/registry.mjs';
+import DocumentPathRepository from '../util/DocumentPathRepository.mjs';
 
 /**
  * Create a dependency injection container for the application
@@ -29,7 +30,7 @@ export default class Container {
       fileService: asClass(FileService).singleton(),
       documentService: asClass(DocumentService).singleton(),
       dossierBuilder: asClass(DossierBuilder).singleton(),
-      sqliteDbPath: asValue(process.env['apps.classifier.db']),
+      documentPathRepository: asClass(DocumentPathRepository).singleton(),
       // Environment values
       classifierQuantity: asValue(appConfig.get('classification.classifierQuantity', 8)),
 
diff --git a/src/mocks/VerificationRepository.mjs b/src/mocks/VerificationRepository.mjs
@@ -1,9 +1,9 @@
 export default class VerificationRepository {
-  findAllByPath() {
+  async findAllByPath() {
     return [];
   }
 
-  findLastFinishedByPath() {
+  async findLastFinishedByPath() {
     return [];
   }
 }
diff --git a/src/services/DocumentPathService.mjs b/src/services/DocumentPathService.mjs
@@ -1,28 +1,33 @@
-import DocumentPathRepository from '../util/DocumentPathRepository.mjs';
 import node_path from 'path';
 import fs from 'fs';
 
 export default class DocumentPathService {
-  constructor(path) {
-    this.repository = new DocumentPathRepository(path);
+  /**
+   * @param {DocumentPathRepository} documentPathRepository
+   */
+  constructor({ documentPathRepository }) {
+    this.repository = documentPathRepository;
   }
 
   async getPath(uuid) {
+    let path = await this.repository.getPathByUuid(uuid);
+
     // Удалить этот кусок после выкладки на прод.
     // Он нужен для того, чтобы корректно загружались файлы в промежутке между
     // выкладкой и запуском скрипта, который спарсит текущую структуру папок в БД
-    let deprecatedPath = await this.getDeprecatedPath(uuid);
+    if (!path) {
+      let deprecatedPath = await this.getDeprecatedPath(uuid);
 
-    if (deprecatedPath) {
-      await this.repository.storeMapping(uuid, uuid);
+      if (deprecatedPath) {
+        path = uuid;
+        await this.repository.storePath(uuid, path);
+      }
     }
     //
 
-    let path = await this.repository.getPathByUuid(uuid);
-
-    if (!path && !deprecatedPath) {
+    if (!path) {
       path = this.generatePath(uuid);
-      await this.repository.storeMapping(uuid, path);
+      await this.repository.storePath(uuid, path);
     }
 
     return path;
diff --git a/src/util/DocumentPathRepository.mjs b/src/util/DocumentPathRepository.mjs
@@ -1,73 +1,15 @@
-import sqlite3 from 'sqlite3';
-import { open } from 'sqlite';
-import fs from 'fs';
-import path from 'path';
-
 /**
  * Repository for document path mappings stored in SQLite
  */
 export default class DocumentPathRepository {
-  /**
-   * Create a document path database
-   * @param {string} dbPath Path to the SQLite database file
-   */
-  constructor(dbPath) {
-    this.dbPath = dbPath;
-    this.dbInitialized = false;
-  }
-
-  /**
-   * Initialize the database
-   * @returns {Promise<void>}
-   */
-  async initializeDb() {
-    // Ensure directory exists
-    const dbDir = path.dirname(this.dbPath);
-    if (!fs.existsSync(dbDir)) {
-      fs.mkdirSync(dbDir, { recursive: true });
-    }
-
-    this.db = await open({
-      filename: this.dbPath,
-      driver: sqlite3.Database
-    });
-
-    // Create table if it doesn't exist
-    await this.db.exec(`
-      CREATE TABLE IF NOT EXISTS classifiercomponent_document_paths
-      (
-        uuid       TEXT PRIMARY KEY,
-        path       TEXT NOT NULL,
-        created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
-      )
-    `);
-
-    this.dbInitialized = true;
-  }
-
-  /**
-   * Ensure database is ready for operations
-   * @returns {Promise<void>}
-   */
-  async ensureDbReady() {
-    if (!this.dbInitialized) {
-      await this.initializeDb();
-    }
-  }
-
   /**
    * Store a mapping from UUID to hierarchical path
    * @param {string} uuid Document UUID
    * @param {string} path Hierarchical path (year/month/day/uuid)
    * @returns {Promise<void>}
    */
-  async storeMapping(uuid, path) {
-    await this.ensureDbReady();
-
-    await this.db.run(
-      'INSERT OR REPLACE INTO classifiercomponent_document_paths (uuid, path) VALUES (?, ?)',
-      [uuid, path]
-    );
+  async storePath(uuid, path) {
+    // нужно сохранить путь где-нибудь
   }
 
   /**
@@ -76,13 +18,7 @@ export default class DocumentPathRepository {
    * @returns {Promise<string|null>} The path or null if not found
    */
   async getPathByUuid(uuid) {
-    await this.ensureDbReady();
-
-    const result = await this.db.get(
-      'SELECT path FROM classifiercomponent_document_paths WHERE uuid = ?',
-      [uuid]
-    );
-
-    return result ? result.path : null;
+    return uuid;
+    // должен вернуть путь к папке с файлами
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -103,4 +103,3 @@ typings/`
`103`	`103`	`/documents/dossier`
`104`	`104`
`105`	`105`	`package-lock.json`
`106`		`-sqlite.db`