Revize 99c92c11

re #9429 Added class and funcionality for Teams table. Modified date parsing and storing. Modified View at /usb-logs/. Replaced "_" with "-" in all endpoints.

server/sql_app/models.py

@@ -1 @@
-from sqlalchemy import Boolean, Column, ForeignKey, Integer, String
+from sqlalchemy import Boolean, Column, ForeignKey, Integer, String, DateTime
 from sqlalchemy.orm import relationship
-
+from sqlalchemy.sql import func
 from .database import Base
 
 
@@ -8 +8 @@
     __tablename__ = "devices"
 
     id = Column(Integer, primary_key=True, index=True)
-    vendor_id = Column(Integer, index=True, nullable=False)
-    product_id = Column(Integer, index=True, nullable=False)
+    vendor_id = Column(String, index=True, nullable=False)
+    product_id = Column(String, index=True, nullable=False)
     serial_number = Column(String, index=True, nullable=False)
+    assigned = Column(Boolean, index=True, nullable=False)
 
     logs = relationship("USBLog", back_populates="device")
     licenses = relationship("DeviceLicense", back_populates="device_lic")
@@ -21 +22 @@
 
     id = Column(Integer, primary_key=True, index=True)
     pc_id = Column(Integer, ForeignKey("pc.id"))
-    timestamp = Column(String, index=True, nullable=False)
+    timestamp = Column(DateTime(timezone=True), server_default=func.now())
     status = Column(String, index=True, nullable=False)
     device_id = Column(Integer, ForeignKey("devices.id"))
 
@@ -34 +35 @@
 
     id = Column(Integer, primary_key=True, index=True)
     name = Column(String, index=True, nullable=False)
-    expiration_date = Column(String, index=True, nullable=False)
+    expiration_date = Column(DateTime(timezone=True), server_default=func.now())
 
     devices = relationship("DeviceLicense", back_populates="licenses")
 
@@ -43 +44 @@
     __tablename__ = "devices_licenses"
 
     id = Column(Integer, primary_key=True, index=True)
-    device_id = Column(Integer, ForeignKey("devices.id"))
-    license_id = Column(Integer, ForeignKey("licenses.id"))
+    device_id = Column(String, ForeignKey("devices.id"))
+    license_id = Column(String, ForeignKey("licenses.id"))
     assigned_datetime = Column(String, index=True, nullable=False)
 
     device_lic = relationship("Device", back_populates="licenses")
@@ -57 +58 @@
     id = Column(Integer, primary_key=True, index=True)
     username = Column(String, index=True, nullable=False)
     hostname = Column(String, index=True, nullable=False)
+    assigned = Column(Boolean, index=True, nullable=False)
+    team_id = Column(Integer, ForeignKey("teams.id"))
+
+    team = relationship("Team", back_populates="pcs")
     logs_pc = relationship("USBLog", back_populates="pc")
+
+
+class Team(Base):
+    __tablename__ = "teams"
+
+    id = Column(Integer, primary_key=True, index=True)
+    name = Column(String, index=True, nullable=False)
+    pcs = relationship("PC", back_populates="team")