diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..47f34fd --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "database/assebmlr"] + path = database/assebmlr + url = https://git.denco.store/agonex/Assemblr-Database.git diff --git a/app.py b/app.py index e9ece98..3d5c99e 100644 --- a/app.py +++ b/app.py @@ -1,4 +1,4 @@ -from flask import Flask, request +from flask import Flask from flask_cors import CORS from flask_jwt_extended import JWTManager from flask_migrate import Migrate diff --git a/assemblr.log b/assemblr.log deleted file mode 100644 index 1a121b3..0000000 --- a/assemblr.log +++ /dev/null @@ -1,89 +0,0 @@ -10-15 00:21 - assemblr - INFO - SiproClient successfully initialized -10-15 00:31 - assemblr - INFO - SiproClient successfully initialized -10-15 00:31 - assemblr - INFO - SiproClient successfully initialized -10-15 00:31 - assemblr - INFO - SiproClient successfully initialized -10-15 00:31 - assemblr - INFO - SiproClient successfully initialized -10-27 03:01 - assemblr - INFO - SiproClient successfully initialized -10-27 04:50 - assemblr - INFO - SiproClient successfully initialized -10-27 04:51 - assemblr - INFO - SiproClient successfully initialized -10-27 05:36 - assemblr - INFO - SiproClient successfully initialized -10-27 05:37 - assemblr - INFO - SiproClient successfully initialized -10-27 05:38 - assemblr - INFO - SiproClient successfully initialized -10-27 05:57 - assemblr - INFO - SiproClient successfully initialized -10-28 04:06 - assemblr - INFO - SiproClient successfully initialized -10-28 04:06 - assemblr - INFO - SiproClient successfully initialized -10-28 04:37 - assemblr - INFO - SiproClient successfully initialized -10-28 04:38 - assemblr - INFO - SiproClient successfully initialized -10-28 04:38 - assemblr - INFO - SiproClient successfully initialized -10-28 04:38 - assemblr - INFO - SiproClient successfully initialized -10-28 05:00 - assemblr - INFO - SiproClient successfully initialized -10-28 05:00 - assemblr - INFO - SiproClient successfully initialized -10-28 05:00 - assemblr - INFO - SiproClient successfully initialized -10-28 05:02 - assemblr - INFO - SiproClient successfully initialized -10-28 05:02 - assemblr - INFO - SiproClient successfully initialized -10-28 05:02 - assemblr - INFO - SiproClient successfully initialized -10-28 05:03 - assemblr - INFO - SiproClient successfully initialized -10-28 05:03 - assemblr - INFO - SiproClient successfully initialized -10-28 05:04 - assemblr - INFO - SiproClient successfully initialized -10-28 05:06 - assemblr - INFO - SiproClient successfully initialized -10-28 05:06 - assemblr - INFO - SiproClient successfully initialized -10-28 05:07 - assemblr - INFO - SiproClient successfully initialized -10-28 05:07 - assemblr - INFO - SiproClient successfully initialized -10-28 05:08 - assemblr - INFO - SiproClient successfully initialized -10-28 05:08 - assemblr - INFO - SiproClient successfully initialized -10-28 05:09 - assemblr - INFO - SiproClient successfully initialized -10-28 05:09 - assemblr - INFO - SiproClient successfully initialized -10-29 01:50 - assemblr - INFO - SiproClient successfully initialized -10-29 01:50 - assemblr - INFO - SiproClient successfully initialized -10-29 02:21 - assemblr - INFO - SiproClient successfully initialized -10-29 02:25 - assemblr - INFO - SiproClient successfully initialized -10-29 06:43 - assemblr - INFO - SiproClient successfully initialized -10-29 06:47 - assemblr - INFO - SiproClient successfully initialized -10-29 06:53 - assemblr - INFO - SiproClient successfully initialized -10-30 03:37 - assemblr - INFO - SiproClient successfully initialized -10-30 03:37 - assemblr - INFO - SiproClient successfully initialized -10-30 03:39 - assemblr - INFO - SiproClient successfully initialized -10-30 04:23 - assemblr - INFO - SiproClient successfully initialized -10-30 05:10 - assemblr - INFO - SiproClient successfully initialized -10-30 05:11 - assemblr - INFO - SiproClient successfully initialized -10-30 05:11 - assemblr - INFO - SiproClient successfully initialized -10-30 05:11 - assemblr - INFO - SiproClient successfully initialized -10-30 05:11 - assemblr - INFO - SiproClient successfully initialized -10-30 05:11 - assemblr - INFO - SiproClient successfully initialized -10-30 05:13 - assemblr - INFO - SiproClient successfully initialized -10-30 05:15 - assemblr - INFO - SiproClient successfully initialized -10-30 05:15 - assemblr - INFO - SiproClient successfully initialized -10-30 05:15 - assemblr - INFO - SiproClient successfully initialized -10-30 05:29 - assemblr - INFO - SiproClient successfully initialized -10-30 05:29 - assemblr - INFO - SiproClient successfully initialized -10-30 05:31 - assemblr - INFO - SiproClient successfully initialized -10-30 05:34 - assemblr - INFO - SiproClient successfully initialized -10-30 05:34 - assemblr - INFO - SiproClient successfully initialized -10-30 05:34 - assemblr - INFO - SiproClient successfully initialized -10-30 05:34 - assemblr - INFO - SiproClient successfully initialized -10-30 05:34 - assemblr - INFO - SiproClient successfully initialized -10-30 05:34 - assemblr - INFO - SiproClient successfully initialized -10-30 05:34 - assemblr - INFO - SiproClient successfully initialized -10-30 05:37 - assemblr - INFO - SiproClient successfully initialized -10-30 05:38 - assemblr - INFO - SiproClient successfully initialized -10-30 05:46 - assemblr - INFO - SiproClient successfully initialized -10-30 06:15 - assemblr - INFO - SiproClient successfully initialized -10-30 06:24 - assemblr - INFO - SiproClient successfully initialized -10-30 06:24 - assemblr - INFO - SiproClient successfully initialized -10-30 07:14 - assemblr - INFO - SiproClient successfully initialized -10-30 07:18 - assemblr - INFO - SiproClient successfully initialized -10-30 07:19 - assemblr - INFO - SiproClient successfully initialized -10-30 07:19 - assemblr - INFO - SiproClient successfully initialized -10-30 07:21 - assemblr - INFO - SiproClient successfully initialized -11-02 03:18 - assemblr - INFO - SiproClient successfully initialized -11-02 03:18 - assemblr - INFO - SiproClient successfully initialized -11-02 03:26 - assemblr - INFO - SiproClient successfully initialized -11-03 04:07 - assemblr - INFO - SiproClient successfully initialized -11-03 04:07 - assemblr - INFO - SiproClient successfully initialized -11-03 04:12 - assemblr - INFO - SiproClient successfully initialized -11-06 03:47 - assemblr - INFO - SiproClient successfully initialized -11-06 03:47 - assemblr - INFO - SiproClient successfully initialized -11-06 03:47 - assemblr - INFO - SiproClient successfully initialized -11-06 05:15 - assemblr - INFO - SiproClient successfully initialized -11-06 05:17 - assemblr - INFO - SiproClient successfully initialized -11-06 05:32 - assemblr - INFO - SiproClient successfully initialized diff --git a/database/__init__.py b/database/__init__.py index 70cdde6..75eb683 100644 --- a/database/__init__.py +++ b/database/__init__.py @@ -1 +1 @@ -from database.models import * +from .assebmlr.models import * diff --git a/database/assebmlr b/database/assebmlr new file mode 160000 index 0000000..4096f3f --- /dev/null +++ b/database/assebmlr @@ -0,0 +1 @@ +Subproject commit 4096f3f868bc263df0989e2496365719b6863f2d diff --git a/database/enums.py b/database/enums.py deleted file mode 100644 index e167a8d..0000000 --- a/database/enums.py +++ /dev/null @@ -1,10 +0,0 @@ -from enum import unique, IntEnum - - -@unique -class AssemblyState(IntEnum): - NOT_STARTED = 0, - ASSEMBLING_PRODUCTS = 1, - ALL_PRODUCTS_ASSEMBLED = 2, - CONFIRMED = 3, - ENDED = 4 diff --git a/database/mariadb.py b/database/mariadb.py index f56740a..388b42d 100644 --- a/database/mariadb.py +++ b/database/mariadb.py @@ -1,5 +1,4 @@ import mariadb - import settings diff --git a/database/models.py b/database/models.py deleted file mode 100644 index 4b77fc3..0000000 --- a/database/models.py +++ /dev/null @@ -1,44 +0,0 @@ -from flask_sqlalchemy import SQLAlchemy - -db = SQLAlchemy() - - -class User(db.Model): - __tablename__ = 'users' - id = db.Column(db.Integer, primary_key=True, comment='ID пользователя') - - login = db.Column(db.String, nullable=False, comment='Логин') - password_hash = db.Column(db.String, nullable=False, comment='Пароль') - - sipro_id = db.Column(db.Integer, nullable=True, comment='ID пользователя в SIPRO') - - -class Assembly(db.Model): - __tablename__ = 'assemblies' - id = db.Column(db.Integer, primary_key=True, comment='ID сборки') - - created_at = db.Column(db.DateTime, nullable=True, comment='Дата и время начала сборки') - ended_at = db.Column(db.DateTime, nullable=True, comment='Дата и время конца сборки') - - user_id = db.Column(db.Integer, db.ForeignKey('users.id'), nullable=False) - user = db.relationship('User', backref='assemblies') - - order_id = db.Column(db.Integer, nullable=False, comment='ID заказа в базе данных') - is_active = db.Column(db.Boolean, nullable=False, comment='Активная ли сборка') - state = db.Column(db.Integer, nullable=False, comment='Состояние сборки') - - -class Barcode(db.Model): - __tablename__ = 'barcodes' - id = db.Column(db.Integer, primary_key=True, comment='ID пользователя') - denco_article = db.Column(db.Integer, nullable=False, comment='Артикул', index=True) - barcode = db.Column(db.String, nullable=False, comment='Баркод', index=True) - - -class Application(db.Model): - __tablename__ = 'applications' - id = db.Column(db.Integer, primary_key=True, comment='') - name = db.Column(db.String(40), nullable=False) - version = db.Column(db.String(10), nullable=False) - uploaded = db.Column(db.DateTime, nullable=False) - filename = db.Column(db.String, nullable=False) diff --git a/routes/assembly.py b/routes/assembly.py index 70af522..1e7d7df 100644 --- a/routes/assembly.py +++ b/routes/assembly.py @@ -1,11 +1,10 @@ import datetime -import time from flask import Blueprint, request, jsonify from flask_jwt_extended import get_jwt_identity import database -from database.enums import AssemblyState +from database.assebmlr.enums import AssemblyState from routes.utils import jwt_protect_blueprint import sipro.api.orders diff --git a/routes/auth.py b/routes/auth.py index 0c2abbf..88c1e17 100644 --- a/routes/auth.py +++ b/routes/auth.py @@ -1,5 +1,5 @@ from flask import Blueprint, request, jsonify -from flask_jwt_extended import create_access_token, jwt_required, get_jwt_identity +from flask_jwt_extended import create_access_token from werkzeug.security import generate_password_hash, check_password_hash from database import User, db diff --git a/utils/barcodes_synchronizer.py b/utils/barcodes_synchronizer.py index f3b85d9..d79557d 100644 --- a/utils/barcodes_synchronizer.py +++ b/utils/barcodes_synchronizer.py @@ -10,7 +10,6 @@ class BarcodesSynchronizer: existing_barcodes = database.Barcode.query.all() denco_articles = list(set([barcode.denco_article for barcode in existing_barcodes])) - query_string = 'SELECT product, barcode FROM modx_0_connections WHERE barcode != "" LIMIT 100' for denco_article, barcodes_string in self.mariadb_connector.select(query_string): barcodes = barcodes_string.split(',')