Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
b97ec5f
feat: Migrate from textual TUI to pyqt6 GUI
AN0DA Apr 30, 2025
35f21cc
refactor: remove unused export directory settings and related code
AN0DA Apr 30, 2025
c5fe5b9
feat: introduce standardized UI components for improved styling and c…
AN0DA May 2, 2025
3854855
feat: implement db_operation decorator for session management in serv…
AN0DA May 2, 2025
f6a332b
feat: replace QTableWidget with DataTable for improved table manageme…
AN0DA May 2, 2025
f2c0f20
feat: add collapsible visualization panel for company relationships w…
AN0DA May 2, 2025
954a385
feat: enhance settings management and improve contact/application ass…
AN0DA May 7, 2025
4278ac9
feat: implement Alembic migration management and database configuration
AN0DA May 7, 2025
981ab16
feat: refactor session management in database operations and enhance …
AN0DA May 7, 2025
06fec30
feat: add test suites for dialog and tab functionalities in the GUI
AN0DA May 8, 2025
11d9576
feat: add initial database migration script and management functionality
AN0DA May 8, 2025
773910c
feat: enhance application and interaction management with new fields …
AN0DA May 9, 2025
9c18d58
feat: add Alembic dependency and update migration dialog to use PyQt6…
AN0DA May 10, 2025
49361e9
feat: add CONTACT_REMOVED change type and update timestamp field to c…
AN0DA May 10, 2025
5b9c8dc
fix: update pagination handling in application and base services to a…
AN0DA May 10, 2025
bb70ba0
feat: add PyInstaller support for packaging and enhance resource path…
AN0DA May 10, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.PHONY: lint mypy test sync
.PHONY: lint mypy test sync migrate revision pyinstaller clean-pyinstaller

all: lint mypy test

Expand All @@ -10,10 +10,25 @@ mypy:
uv run mypy src/

test:
PYTHONPATH=$(PWD) uv run pytest --cov --cov-report term-missing:skip-covered
PYTHONPATH=$(PWD) uv run pytest --cov --cov-report term-missing:skip-covered --tb=short

sync:
uv sync --all-groups

dump:
./dump.sh src src.dump

# Create a new migration revision
revision:
@read -p "Enter migration message: " message; \
python -m scripts.migration_manager --revision "$$message"

# Run database migrations
migrate:
python -m scripts.migration_manager

pyinstaller:
pyinstaller ./JobTrackr.spec
clean-pyinstaller:
rm -rf build dist

119 changes: 119 additions & 0 deletions alembic.ini
Original file line number Diff line number Diff line change
@@ -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 = driver://user:pass@localhost/dbname


[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 = check --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
1 change: 1 addition & 0 deletions alembic/README
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Generic single-database configuration.
87 changes: 87 additions & 0 deletions alembic/env.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
from logging.config import fileConfig

from sqlalchemy import engine_from_config
from sqlalchemy import pool

from alembic import context
import os
import sys

# Add the project root to the path
sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))

from src.db.settings import Settings
from src.db.models import Base

# this is the Alembic Config object, which provides
# access to the values within the .ini file in use.
config = context.config

# 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
target_metadata = Base.metadata

# Get database URL from settings
settings = Settings()
db_path = settings.get("database_path")
config.set_main_option("sqlalchemy.url", f"sqlite:///{db_path}")


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"},
render_as_batch=True
)

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,
render_as_batch=True
)

with context.begin_transaction():
context.run_migrations()


if context.is_offline_mode():
run_migrations_offline()
else:
run_migrations_online()
28 changes: 28 additions & 0 deletions alembic/script.py.mako
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
"""${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:
"""Upgrade schema."""
${upgrades if upgrades else "pass"}


def downgrade() -> None:
"""Downgrade schema."""
${downgrades if downgrades else "pass"}
62 changes: 62 additions & 0 deletions alembic/versions/0d60e646518c_.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
"""empty message

Revision ID: 0d60e646518c
Revises: 5391b8a670c1
Create Date: 2025-05-09 14:33:50.858489

"""
from typing import Sequence, Union

from alembic import op
import sqlalchemy as sa


# revision identifiers, used by Alembic.
revision: str = '0d60e646518c'
down_revision: Union[str, None] = '5391b8a670c1'
branch_labels: Union[str, Sequence[str], None] = None
depends_on: Union[str, Sequence[str], None] = None


def upgrade() -> None:
"""Upgrade schema."""
# ### commands auto generated by Alembic - please adjust! ###
with op.batch_alter_table('applications', schema=None) as batch_op:
batch_op.add_column(sa.Column('notes', sa.Text(), nullable=True))
batch_op.alter_column('position',
existing_type=sa.VARCHAR(length=255),
nullable=False)
batch_op.alter_column('status',
existing_type=sa.VARCHAR(length=50),
nullable=False)
batch_op.alter_column('applied_date',
existing_type=sa.DATETIME(),
nullable=False)
batch_op.drop_column('remote')
batch_op.drop_column('job_url')
batch_op.drop_column('status_details')
batch_op.drop_column('application_method')

# ### end Alembic commands ###


def downgrade() -> None:
"""Downgrade schema."""
# ### commands auto generated by Alembic - please adjust! ###
with op.batch_alter_table('applications', schema=None) as batch_op:
batch_op.add_column(sa.Column('application_method', sa.VARCHAR(length=50), nullable=True))
batch_op.add_column(sa.Column('status_details', sa.TEXT(), nullable=True))
batch_op.add_column(sa.Column('job_url', sa.VARCHAR(length=255), nullable=True))
batch_op.add_column(sa.Column('remote', sa.VARCHAR(length=50), nullable=True))
batch_op.alter_column('applied_date',
existing_type=sa.DATETIME(),
nullable=True)
batch_op.alter_column('status',
existing_type=sa.VARCHAR(length=50),
nullable=True)
batch_op.alter_column('position',
existing_type=sa.VARCHAR(length=255),
nullable=True)
batch_op.drop_column('notes')

# ### end Alembic commands ###
30 changes: 30 additions & 0 deletions alembic/versions/5391b8a670c1_add_link_to_applications.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
"""add_link_to_applications

Revision ID: 5391b8a670c1
Revises: b610c5984d3c
Create Date: 2025-05-09 14:31:34.028056

"""
from typing import Sequence, Union

from alembic import op
import sqlalchemy as sa


# revision identifiers, used by Alembic.
revision: str = '5391b8a670c1'
down_revision: Union[str, None] = 'b610c5984d3c'
branch_labels: Union[str, Sequence[str], None] = None
depends_on: Union[str, Sequence[str], None] = None


def upgrade() -> None:
"""Upgrade schema."""
# Add link column to applications table
op.add_column('applications', sa.Column('link', sa.String(255), nullable=True))


def downgrade() -> None:
"""Downgrade schema."""
# Remove link column from applications table
op.drop_column('applications', 'link')
Loading
Loading