Merge pull request 'separation' (#1 ) from separation into master

Reviewed-on: #1
Removal of log
2023-11-25 00:11:27 +03:00 · 2023-11-25 01:09:56 +04:00 · 2023-11-25 01:07:25 +04:00 · 2023-11-25 01:06:11 +04:00 · 2023-11-25 01:03:10 +04:00 · 2023-11-25 00:36:54 +04:00
11 changed files with 8 additions and 150 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "database/assebmlr"]
+	path = database/assebmlr
+	url = https://git.denco.store/agonex/Assemblr-Database.git
--- 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
--- a/assemblr.log
+++ b/assemblr.log
@@ -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
--- a/database/init.py
+++ b/database/init.py
@@ -1 +1 @@
-from database.models import *
+from .assebmlr.models import *
--- a/database/assebmlr
+++ b/database/assebmlr
--- a/database/enums.py
+++ b/database/enums.py
@@ -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
--- a/database/mariadb.py
+++ b/database/mariadb.py
@@ -1,5 +1,4 @@
 import mariadb
-
 import settings


--- a/database/models.py
+++ b/database/models.py
@@ -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)
--- 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

--- 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
--- 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(',')
Author	SHA1	Message	Date
agonex	c5cd5ded3a	Merge pull request 'separation' (#1 ) from separation into master Reviewed-on: #1	2023-11-25 00:11:27 +03:00
dznFK	4f325898f9	Removal of log	2023-11-25 01:09:56 +04:00
dznFK	82c67434e2	Submodule update	2023-11-25 01:07:25 +04:00
dznFK	f0fce37a0c	Assembly separation	2023-11-25 01:06:11 +04:00
dznFK	52f54d086f	Assembly separation	2023-11-25 01:03:10 +04:00
dznFK	07735b5e2c	Changes	2023-11-25 00:36:54 +04:00
dznFK	b5a3b3f1d1	Structural changes	2023-11-25 00:34:30 +04:00
dznFK	3468d5e640	Submodule added	2023-11-25 00:12:23 +04:00
dznFK	0b7a69c691	Separation	2023-11-25 00:11:23 +04:00