q

Dockerfile

@@ -0,0 +1,13 @@
+FROM python:3.9-slim
+
+WORKDIR /app
+
+COPY requirements.txt .
+
+RUN pip install --no-cache-dir -r requirements.txt
+
+COPY . .
+
+EXPOSE 8000
+
+CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8000"]

alembic.ini

@@ -0,0 +1,119 @@
+# A generic, single database configuration.
+
+[alembic]
+# path to migration scripts
+# Use forward slashes (/) also on windows to provide an os agnostic path
+script_location = alembic
+
+# template used to generate migration file names; The default value is %%(rev)s_%%(slug)s
+# Uncomment the line below if you want the files to be prepended with date and time
+# see https://alembic.sqlalchemy.org/en/latest/tutorial.html#editing-the-ini-file
+# for all available tokens
+# file_template = %%(year)d_%%(month).2d_%%(day).2d_%%(hour).2d%%(minute).2d-%%(rev)s_%%(slug)s
+
+# sys.path path, will be prepended to sys.path if present.
+# defaults to the current working directory.
+prepend_sys_path = .
+
+# timezone to use when rendering the date within the migration file
+# as well as the filename.
+# If specified, requires the python>=3.9 or backports.zoneinfo library and tzdata library.
+# Any required deps can installed by adding `alembic[tz]` to the pip requirements
+# string value is passed to ZoneInfo()
+# leave blank for localtime
+# timezone =
+
+# max length of characters to apply to the "slug" field
+# truncate_slug_length = 40
+
+# set to 'true' to run the environment during
+# the 'revision' command, regardless of autogenerate
+# revision_environment = false
+
+# set to 'true' to allow .pyc and .pyo files without
+# a source .py file to be detected as revisions in the
+# versions/ directory
+# sourceless = false
+
+# version location specification; This defaults
+# to alembic/versions.  When using multiple version
+# directories, initial revisions must be specified with --version-path.
+# The path separator used here should be the separator specified by "version_path_separator" below.
+# version_locations = %(here)s/bar:%(here)s/bat:alembic/versions
+
+# version path separator; As mentioned above, this is the character used to split
+# version_locations. The default within new alembic.ini files is "os", which uses os.pathsep.
+# If this key is omitted entirely, it falls back to the legacy behavior of splitting on spaces and/or commas.
+# Valid values for version_path_separator are:
+#
+# version_path_separator = :
+# version_path_separator = ;
+# version_path_separator = space
+# version_path_separator = newline
+#
+# Use os.pathsep. Default configuration used for new projects.
+version_path_separator = os
+
+# set to 'true' to search source files recursively
+# in each "version_locations" directory
+# new in Alembic version 1.10
+# recursive_version_locations = false
+
+# the output encoding used when revision files
+# are written from script.py.mako
+# output_encoding = utf-8
+
+sqlalchemy.url = sqlite:///omegacard.db
+
+
+[post_write_hooks]
+# post_write_hooks defines scripts or Python functions that are run
+# on newly generated revision scripts.  See the documentation for further
+# detail and examples
+
+# format using "black" - use the console_scripts runner, against the "black" entrypoint
+# hooks = black
+# black.type = console_scripts
+# black.entrypoint = black
+# black.options = -l 79 REVISION_SCRIPT_FILENAME
+
+# lint with attempts to fix using "ruff" - use the exec runner, execute a binary
+# hooks = ruff
+# ruff.type = exec
+# ruff.executable = %(here)s/.venv/bin/ruff
+# ruff.options = --fix REVISION_SCRIPT_FILENAME
+
+# Logging configuration
+[loggers]
+keys = root,sqlalchemy,alembic
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = WARNING
+handlers = console
+qualname =
+
+[logger_sqlalchemy]
+level = WARNING
+handlers =
+qualname = sqlalchemy.engine
+
+[logger_alembic]
+level = INFO
+handlers =
+qualname = alembic
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(levelname)-5.5s [%(name)s] %(message)s
+datefmt = %H:%M:%S

alembic/README

@@ -0,0 +1 @@
+Generic single-database configuration.

alembic/env.py

@@ -0,0 +1,90 @@
+from logging.config import fileConfig
+
+from sqlalchemy import engine_from_config
+from sqlalchemy import pool
+
+from alembic import context
+
+import sys
+import os
+
+sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
+
+from db.models import Base
+from db.database import DATABASE_URL
+
+# this is the Alembic Config object, which provides
+# access to the values within the .ini file in use.
+config = context.config
+
+config.set_main_option('sqlalchemy.url', DATABASE_URL)
+
+
+
+# Interpret the config file for Python logging.
+# This line sets up loggers basically.
+if config.config_file_name is not None:
+    fileConfig(config.config_file_name)
+
+# add your model's MetaData object here
+# for 'autogenerate' support
+# from myapp import mymodel
+# target_metadata = mymodel.Base.metadata
+target_metadata = Base.metadata
+
+# other values from the config, defined by the needs of env.py,
+# can be acquired:
+# my_important_option = config.get_main_option("my_important_option")
+# ... etc.
+
+
+def run_migrations_offline() -> None:
+    """Run migrations in 'offline' mode.
+
+    This configures the context with just a URL
+    and not an Engine, though an Engine is acceptable
+    here as well.  By skipping the Engine creation
+    we don't even need a DBAPI to be available.
+
+    Calls to context.execute() here emit the given string to the
+    script output.
+
+    """
+    url = config.get_main_option("sqlalchemy.url")
+    context.configure(
+        url=url,
+        target_metadata=target_metadata,
+        literal_binds=True,
+        dialect_opts={"paramstyle": "named"},
+    )
+
+    with context.begin_transaction():
+        context.run_migrations()
+
+
+def run_migrations_online() -> None:
+    """Run migrations in 'online' mode.
+
+    In this scenario we need to create an Engine
+    and associate a connection with the context.
+
+    """
+    connectable = engine_from_config(
+        config.get_section(config.config_ini_section, {}),
+        prefix="sqlalchemy.",
+        poolclass=pool.NullPool,
+    )
+
+    with connectable.connect() as connection:
+        context.configure(
+            connection=connection, target_metadata=target_metadata
+        )
+
+        with context.begin_transaction():
+            context.run_migrations()
+
+
+if context.is_offline_mode():
+    run_migrations_offline()
+else:
+    run_migrations_online()

alembic/script.py.mako

@@ -0,0 +1,26 @@
+"""${message}
+
+Revision ID: ${up_revision}
+Revises: ${down_revision | comma,n}
+Create Date: ${create_date}
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+${imports if imports else ""}
+
+# revision identifiers, used by Alembic.
+revision: str = ${repr(up_revision)}
+down_revision: Union[str, None] = ${repr(down_revision)}
+branch_labels: Union[str, Sequence[str], None] = ${repr(branch_labels)}
+depends_on: Union[str, Sequence[str], None] = ${repr(depends_on)}
+
+
+def upgrade() -> None:
+    ${upgrades if upgrades else "pass"}
+
+
+def downgrade() -> None:
+    ${downgrades if downgrades else "pass"}

alembic/versions/f629adc7e597_.py

@@ -0,0 +1,30 @@
+"""empty message
+
+Revision ID: f629adc7e597
+Revises: 
+Create Date: 2025-02-07 20:13:32.559672
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = 'f629adc7e597'
+down_revision: Union[str, None] = None
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###

app/db/models.py

@@ -132,7 +132,7 @@ class Card(Base):
     date_modified = Column(DateTime, default=datetime.now, onupdate=datetime.now)
 
 class CardManabox(Base):
-    __tablename__ = "card_manabox"
+    __tablename__ = "manabox_cards"
 
     product_id = Column(String, ForeignKey("cards.product_id"), primary_key=True)
     name = Column(String)
@@ -147,7 +147,7 @@ class CardManabox(Base):
     language = Column(String)
 
 class CardTCGPlayer(Base):
-    __tablename__ = "card_tcgplayer"
+    __tablename__ = "tcgplayer_cards"
 
     product_id = Column(String, ForeignKey("cards.product_id"), primary_key=True)
     group_id = Column(Integer, ForeignKey("tcgplayer_groups.group_id"))
@@ -164,7 +164,7 @@ class Warehouse(Base):
     """
     container that is associated with a user and contains inventory and stock
     """
-    __tablename__ = "warehouse"
+    __tablename__ = "warehouses"
 
     id = Column(String, primary_key=True)
     user_id = Column(String, ForeignKey("users.id"))
@@ -175,10 +175,10 @@ class Stock(Base):
     """
     contains products that are listed for sale
     """
-    __tablename__ = "stock"
+    __tablename__ = "stocks"
 
     product_id = Column(String, ForeignKey("products.id"), primary_key=True)
-    warehouse_id = Column(String, ForeignKey("warehouse.id"), default="default")
+    warehouse_id = Column(String, ForeignKey("warehouses.id"), default="default")
     marketplace_id = Column(String, ForeignKey("marketplaces.id"))
     quantity = Column(Integer)
     date_created = Column(DateTime, default=datetime.now)
@@ -190,10 +190,10 @@ class Inventory(Base):
     sealed product in breakdown queue, held sealed product, speculatively held singles, etc.
     inventory can contain products across multiple marketplaces
     """
-    __tablename__ = "inventory"
+    __tablename__ = "inventories"
 
     product_id = Column(String, ForeignKey("products.id"), primary_key=True)
-    warehouse_id = Column(String, ForeignKey("warehouse.id"), default="default")
+    warehouse_id = Column(String, ForeignKey("warehouses.id"), default="default")
     quantity = Column(Integer)
     date_created = Column(DateTime, default=datetime.now)
     date_modified = Column(DateTime, default=datetime.now, onupdate=datetime.now)
@@ -248,7 +248,7 @@ class File(Base):
     date_modified = Column(DateTime, default=datetime.now, onupdate=datetime.now)
 
 class Price(Base):
-    __tablename__ = "price"
+    __tablename__ = "prices"
 
     id = Column(String, primary_key=True)
     product_id = Column(String, ForeignKey("products.id"))
@@ -271,7 +271,7 @@ class StorageBlock(Base):
         return type
 
     id = Column(String, primary_key=True)
-    warehouse_id = Column(String, ForeignKey("warehouse.id"))
+    warehouse_id = Column(String, ForeignKey("warehouses.id"))
     name = Column(String)
     type = Column(String) # rare or common
     date_created = Column(DateTime, default=datetime.now)
@@ -282,7 +282,7 @@ class ProductBlock(Base):
     ProductBlock represents the relationship between a product and a storage block
     which products are in a block and at what index
     """
-    __tablename__ = "product_block"
+    __tablename__ = "product_blocks"
 
     id = Column(String, primary_key=True)
     product_id = Column(String, ForeignKey("products.id"))
@@ -295,7 +295,7 @@ class OpenBoxCard(Base):
     """
     OpenedBoxCard represents the relationship between an opened box and the cards it contains
     """
-    __tablename__ = "open_box_card"
+    __tablename__ = "open_box_cards"
 
     id = Column(String, primary_key=True)
     open_box_id = Column(String, ForeignKey("open_boxes.id"))
@@ -308,7 +308,7 @@ class ProductSale(Base):
     """
     ProductSale represents the relationship between products and sales
     """
-    __tablename__ = "product_sale"
+    __tablename__ = "product_sales"
 
     id = Column(String, primary_key=True)
     product_id = Column(String, ForeignKey("products.id"))

app/services/file.py

@@ -14,7 +14,7 @@ logger = logging.getLogger(__name__)
 
 class FileConfig:
     """Configuration constants for file processing"""
-    TEMP_DIR = os.path.join(os.getcwd(), 'temp')
+    TEMP_DIR = os.path.join(os.getcwd(), 'app/' + 'temp')
     
     MANABOX_HEADERS = [
         'Name', 'Set code', 'Set name', 'Collector number', 'Foil', 

app/services/task.py

@@ -23,7 +23,7 @@ class TaskService:
         # self.pricing_service.generate_tcgplayer_inventory_update_file_with_pricing(['e20cc342-23cb-4593-89cb-56a0cb3ed3f3'])
     
     def register_scheduled_tasks(self):
-        self.scheduler.add_job(self.hourly_pricing, 'cron', minute='0')
+        self.scheduler.add_job(self.hourly_pricing, 'cron', minute='45')
         self.logger.info("Scheduled tasks registered.")
 
     def hourly_pricing(self):

app/services/tcgplayer.py

@@ -459,7 +459,7 @@ class TCGPlayerService:
     def get_pricing_export_for_all_products(self) -> File:
         """
         """
-        DEBUG = True
+        DEBUG = False
         if DEBUG:
             logger.debug("DEBUG: Using existing pricing export file")
             file = self.db.query(File).filter(File.type == 'tcgplayer_pricing_export').first()

pytest.ini

@@ -1,2 +1,2 @@
 [pytest]
-pythonpath = .
+pythonpath = ./app