Progress...

models.py

@@ -1,11 +1,9 @@
-from sqlalchemy import Boolean, Column, ForeignKey, Integer, String, DateTime, Float
+from sqlalchemy import Boolean, Column, ForeignKey, Integer, String, DateTime, Float, Numeric
 from sqlalchemy.types import TypeDecorator, VARCHAR, Integer
 from sqlalchemy_utils import EmailType
-from sqlalchemy.orm import relationship, Mapped
-from geoalchemy2 import Geometry
+from sqlalchemy.orm import relationship
 from database import Base
 import datetime
-from coordinates_class import EasyGeometry
 
 class NullCatchingString(TypeDecorator):
     impl = VARCHAR
@@ -57,8 +55,10 @@ class Payments(Base):
     __tablename__ = 'payments'
 
     id = Column(Integer, primary_key=True, index=True)
-    payment_date = Column(String, index=True)
+    payment_date = Column(DateTime, index=True)
     member_id = Column(Integer, ForeignKey("members.id"))
+    payment_amount = Column(Numeric)
+    payment_year = Column(DateTime, index=True)
 
     def __repr__(self):
         return f'<Comment "{self.content[:20]}...">'
@@ -77,4 +77,19 @@ class Deliveries(Base):
     
 """     delivered_by_id = Column(Integer, ForeignKey("members.id" ))
     member = relationship("Members", foreign_keys=[member_id])
-    delivering_member = relationship("Members", foreign_keys=[member_id]) """
+    delivering_member = relationship("Members", foreign_keys=[member_id]) """
+
+class Payments_CSV(Base):
+    __tablename__ = 'payments_csv'
+
+    id = Column(Integer, primary_key=True, index=True)
+    pc_valuta_date = Column(DateTime)
+    pc_client = Column(String)
+    pc_reference = Column(String)
+    pc_intended = Column(String)
+    pc_iban = Column(String) 
+    pc_entry_date = Column(DateTime)
+    pc_amount = Column(Numeric)
+    pc_currency = Column(String) 
+    pc_timestamp = Column(DateTime)
+    pc_processed = Column(Boolean, default=False)