Implement transaction handling

app/models/chargepoint.py

@@ -1,5 +1,5 @@
 import uuid
-from sqlalchemy import Uuid, Boolean, Column, DateTime, String
+from sqlalchemy import ForeignKey, Numeric, Uuid, Boolean, Column, DateTime, String
 from sqlalchemy.orm import relationship
 
 from app.database import Base
@@ -8,9 +8,10 @@ class ChargePoint(Base):
     __tablename__ = "chargepoints"
 
     id = Column(Uuid, primary_key=True, default=uuid.uuid4)
-    friendly_name = Column(String, unique=True, index=True)
+    identity = Column(String, unique=True, index=True)
     is_active = Column(Boolean, default=True)
     password = Column(String)
+    price = Column(Numeric(10, 2))
 
     last_seen = Column(DateTime, nullable=True)
     vendor_name = Column(String, nullable=True)
@@ -18,4 +19,7 @@ class ChargePoint(Base):
     serial_number = Column(String, nullable=True)
     firmware_version = Column(String, nullable=True)
 
+    learn_user_id = Column(Uuid, ForeignKey("users.id"), nullable=True)
+    learn_until = Column(DateTime, nullable=True)
+
     connectors = relationship("Connector", cascade="delete, delete-orphan")

app/models/meter_value.py

@@ -4,14 +4,14 @@ from sqlalchemy import Uuid, Column, DateTime, Enum, Float, ForeignKey, String
 from app.database import Base
 from app.schemas.meter_value import Measurand, PhaseType
 
-class Transaction(Base):
+class MeterValue(Base):
     __tablename__ = "meter_values"
 
     id = Column(Uuid, primary_key=True, default=uuid.uuid4)
     timestamp = Column(DateTime, index=True)
-    measurand = Column(Enum(Measurand))
-    phase_type = Column(Enum(PhaseType))
-    unit = Column(String)
+    measurand = Column(Enum(Measurand), index=True)
+    phase_type = Column(Enum(PhaseType), nullable=True)
+    unit = Column(String, nullable=True)
     value = Column(Float)
 
-    transaction_id = Column(Uuid, ForeignKey("transactions.id"), index=True)
+    transaction_id = Column(String, ForeignKey("transactions.id"), index=True)

app/models/transaction.py

@@ -1,6 +1,4 @@
-import uuid
-from sqlalchemy import Uuid, Column, DateTime, Enum, Float, ForeignKey
-from sqlalchemy.orm import relationship, backref
+from sqlalchemy import String, Uuid, Column, DateTime, Enum, Numeric, ForeignKey
 
 from app.schemas.transaction import TransactionEventTriggerReason, TransactionStatus
 from app.database import Base
@@ -8,13 +6,14 @@ from app.database import Base
 class Transaction(Base):
     __tablename__ = "transactions"
 
-    id = Column(Uuid, primary_key=True, default=uuid.uuid4)
+    id = Column(String, primary_key=True)
     status = Column(Enum(TransactionStatus), index=True)
     started_at = Column(DateTime, index=True)
     ended_at = Column(DateTime, nullable=True, index=True)
-    meter_start = Column(Float)
-    meter_end = Column(Float, nullable=True)
-    end_reason = Column(Enum(TransactionEventTriggerReason))
+    meter_start = Column(Numeric(10,2))
+    meter_end = Column(Numeric(10,2), nullable=True)
+    end_reason = Column(Enum(TransactionEventTriggerReason), nullable=True)
+    price = Column(Numeric(10,2))
 
-    connector_id = Column(Uuid, ForeignKey("connectors.id"), index=True)
-    id_token_id = Column(Uuid, ForeignKey("id_tokens.id"), index= True)
+    user_id = Column(Uuid, ForeignKey("users.id"), nullable=True, index=True)
+    chargepoint_id = Column(Uuid, ForeignKey("chargepoints.id"), index=True)

app/models/user.py

@@ -12,3 +12,4 @@ class User(Base):
     is_active = Column(Boolean, default=True)
     
     id_tokens = relationship("IdToken", back_populates="owner", cascade="delete, delete-orphan")
+    transactions = relationship("Transaction", cascade="delete, delete-orphan")