add idm and chip_id fields to card table

core/data/alembic/versions/48f4acc43a7e_card_add_idm_chip_id.py

@@ -0,0 +1,50 @@
+"""card_add_idm_chip_id
+
+Revision ID: 48f4acc43a7e
+Revises: 1e150d16ab6b
+Create Date: 2024-06-21 23:53:34.369134
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import mysql
+
+# revision identifiers, used by Alembic.
+revision = '48f4acc43a7e'
+down_revision = '1e150d16ab6b'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('aime_card', sa.Column('idm', sa.String(length=16), nullable=True))
+    op.add_column('aime_card', sa.Column('chip_id', sa.BIGINT(), nullable=True))
+    op.alter_column('aime_card', 'access_code',
+               existing_type=mysql.VARCHAR(length=20),
+               nullable=False)
+    op.alter_column('aime_card', 'created_date',
+               existing_type=mysql.TIMESTAMP(),
+               server_default=sa.text('now()'),
+               existing_nullable=True)
+    op.create_unique_constraint(None, 'aime_card', ['chip_id'])
+    op.create_unique_constraint(None, 'aime_card', ['idm'])
+    op.create_unique_constraint(None, 'aime_card', ['access_code'])
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_constraint(None, 'aime_card', type_='unique')
+    op.drop_constraint(None, 'aime_card', type_='unique')
+    op.drop_constraint(None, 'aime_card', type_='unique')
+    op.alter_column('aime_card', 'created_date',
+               existing_type=mysql.TIMESTAMP(),
+               server_default=sa.text('CURRENT_TIMESTAMP'),
+               existing_nullable=True)
+    op.alter_column('aime_card', 'access_code',
+               existing_type=mysql.VARCHAR(length=20),
+               nullable=True)
+    op.drop_column('aime_card', 'chip_id')
+    op.drop_column('aime_card', 'idm')
+    # ### end Alembic commands ###

core/data/schema/card.py

@@ -1,6 +1,6 @@
 from typing import Dict, List, Optional
 from sqlalchemy import Table, Column, UniqueConstraint
-from sqlalchemy.types import Integer, String, Boolean, TIMESTAMP
+from sqlalchemy.types import Integer, String, Boolean, TIMESTAMP, BIGINT
 from sqlalchemy.sql.schema import ForeignKey
 from sqlalchemy.sql import func
 from sqlalchemy.engine import Row
@@ -11,12 +11,10 @@ aime_card = Table(
     "aime_card",
     metadata,
     Column("id", Integer, primary_key=True, nullable=False),
-    Column(
-        "user",
-        ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"),
-        nullable=False,
-    ),
-    Column("access_code", String(20)),
+    Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False),
+    Column("access_code", String(20), nullable=False, unique=True),
+    Column("idm", String(16), unique=True),
+    Column("chip_id", BIGINT, unique=True),
     Column("created_date", TIMESTAMP, server_default=func.now()),
     Column("last_login_date", TIMESTAMP, onupdate=func.now()),
     Column("is_locked", Boolean, server_default="0"),
@@ -122,6 +120,26 @@ class CardData(BaseData):
         if result is None:
             self.logger.warn(f"Failed to update last login time for {access_code}")
 
+    async def get_card_by_idm(self, idm: str) -> Optional[Row]:
+        result = await self.execute(aime_card.select(aime_card.c.idm == idm))
+        if result:
+            return result.fetchone()
+
+    async def get_card_by_chip_id(self, chip_id: int) -> Optional[Row]:
+        result = await self.execute(aime_card.select(aime_card.c.chip_id == chip_id))
+        if result:
+            return result.fetchone()
+
+    async def set_chip_id_by_access_code(self, access_code: str, chip_id: int) -> Optional[Row]:
+        result = await self.execute(aime_card.update(aime_card.c.access_code == access_code).values(chip_id=chip_id))
+        if not result:
+            self.logger.error(f"Failed to update chip ID to {chip_id} for {access_code}")
+
+    async def set_idm_by_access_code(self, access_code: str, idm: str) -> Optional[Row]:
+        result = await self.execute(aime_card.update(aime_card.c.access_code == access_code).values(idm=idm))
+        if not result:
+            self.logger.error(f"Failed to update IDm to {idm} for {access_code}")
+
     def to_access_code(self, luid: str) -> str:
         """
         Given a felica cards internal 16 hex character luid, convert it to a 0-padded 20 digit access code as a string
@@ -132,4 +150,4 @@ class CardData(BaseData):
         """
         Given a 20 digit access code as a string, return the 16 hex character luid
         """
-        return f"{int(access_code):0{16}x}"
+        return f"{int(access_code):0{16}X}"