-
Notifications
You must be signed in to change notification settings - Fork 6
feat(schedule): add PostgreSQL and SQLite storage #191
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
znnnnnnn-wil
wants to merge
11
commits into
1024XEngineer:main
from
znnnnnnn-wil:feat/schedule-storage
Closed
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
473b094
feat(schedule): define agent schedule service skeleton
znnnnnnn-wil e5ea726
test(schedule): lock agent service interface contract
znnnnnnn-wil ef6897e
feat(schedule): define local calendar sync contracts
znnnnnnn-wil 7252b3f
fix(schedule): use StrEnum for schedule enums
znnnnnnn-wil 885308f
fix(schedule): tighten update and error contracts
znnnnnnn-wil 0c72d90
refactor(schedule): separate local read and sync contracts
znnnnnnn-wil 286412e
fix(schedule): align recurring and reminder contracts
znnnnnnn-wil 93a35da
Merge remote-tracking branch 'timeflow/main' into feat/schedule-storage
znnnnnnn-wil 5350b3f
feat(schedule): add cloud schedule persistence
znnnnnnn-wil aa96588
feat(schedule): add local SQLite storage
znnnnnnn-wil f888adf
Merge remote-tracking branch 'timeflow/main' into feat/schedule-storage
znnnnnnn-wil File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
382 changes: 382 additions & 0 deletions
382
backend/alembic/versions/20260810_0003_schedule_storage_v3.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,382 @@ | ||
| """Align schedule storage with the v3.10 architecture. | ||
|
|
||
| Revision ID: 20260810_0003 | ||
| Revises: 20260729_0002 | ||
| Create Date: 2026-08-10 | ||
| """ | ||
|
|
||
| from collections.abc import Sequence | ||
|
|
||
| import sqlalchemy as sa | ||
|
|
||
| from alembic import op | ||
|
|
||
| revision: str = "20260810_0003" | ||
| down_revision: str | Sequence[str] | None = "20260729_0002" | ||
| branch_labels: str | Sequence[str] | None = None | ||
| depends_on: str | Sequence[str] | None = None | ||
|
|
||
|
|
||
| def _create_v3_schedules_table() -> None: | ||
| op.create_table( | ||
| "schedules_v3", | ||
| sa.Column("id", sa.String(length=64), primary_key=True, nullable=False), | ||
| sa.Column("account_id", sa.String(length=64), nullable=False), | ||
| sa.Column("schedule_type", sa.String(length=16), nullable=False), | ||
| sa.Column( | ||
| "schedule_kind", | ||
| sa.String(length=16), | ||
| nullable=False, | ||
| server_default="once", | ||
| ), | ||
| sa.Column("title", sa.String(length=255), nullable=False), | ||
| sa.Column( | ||
| "is_all_day", | ||
| sa.Boolean(), | ||
| nullable=False, | ||
| server_default=sa.text("false"), | ||
| ), | ||
| sa.Column("start_time", sa.DateTime(timezone=True), nullable=True), | ||
| sa.Column("end_time", sa.DateTime(timezone=True), nullable=True), | ||
| sa.Column("timezone", sa.String(length=64), nullable=False), | ||
| sa.Column("recurrence_rule", sa.String(length=512), nullable=True), | ||
| sa.Column("location_name", sa.String(length=255), nullable=True), | ||
| sa.Column("latitude", sa.Numeric(precision=9, scale=6), nullable=True), | ||
| sa.Column("longitude", sa.Numeric(precision=9, scale=6), nullable=True), | ||
| sa.Column("reminder_type", sa.String(length=32), nullable=True), | ||
| sa.Column("reminder_trigger_at", sa.DateTime(timezone=True), nullable=True), | ||
| sa.Column("reminder_offset_minutes", sa.Integer(), nullable=True), | ||
| sa.Column("reminder_strength", sa.String(length=16), nullable=True), | ||
| sa.Column("reminder_disposition_state", sa.String(length=16), nullable=True), | ||
| sa.Column("status", sa.String(length=16), nullable=False), | ||
| sa.Column("revision", sa.BigInteger(), nullable=False), | ||
| sa.Column("created_at", sa.DateTime(timezone=True), nullable=False), | ||
| sa.Column("updated_at", sa.DateTime(timezone=True), nullable=False), | ||
| sa.Column("deleted_at", sa.DateTime(timezone=True), nullable=True), | ||
| sa.CheckConstraint( | ||
| "schedule_type IN ('time', 'location')", | ||
| name="ck_schedules_schedule_type", | ||
| ), | ||
| sa.CheckConstraint( | ||
| "schedule_kind IN ('once', 'recurring')", | ||
| name="ck_schedules_schedule_kind", | ||
| ), | ||
| sa.CheckConstraint( | ||
| "status IN ('active', 'deleted')", | ||
| name="ck_schedules_status", | ||
| ), | ||
| sa.CheckConstraint( | ||
| "reminder_type IS NULL OR reminder_type IN " | ||
| "('at_time', 'before_start', 'arrive_location', " | ||
| "'return_to_recorded_location')", | ||
| name="ck_schedules_reminder_type", | ||
| ), | ||
| sa.CheckConstraint( | ||
| "reminder_strength IS NULL OR reminder_strength IN ('low', 'medium', 'high')", | ||
| name="ck_schedules_reminder_strength", | ||
| ), | ||
| sa.CheckConstraint( | ||
| "reminder_disposition_state IS NULL OR reminder_disposition_state = 'confirmed'", | ||
| name="ck_schedules_reminder_disposition_state", | ||
| ), | ||
| sa.CheckConstraint("revision > 0", name="ck_schedules_revision_positive"), | ||
| sa.CheckConstraint( | ||
| "latitude IS NULL OR latitude BETWEEN -90 AND 90", | ||
| name="ck_schedules_latitude_range", | ||
| ), | ||
| sa.CheckConstraint( | ||
| "longitude IS NULL OR longitude BETWEEN -180 AND 180", | ||
| name="ck_schedules_longitude_range", | ||
| ), | ||
| sa.CheckConstraint( | ||
| "(schedule_type = 'time' AND start_time IS NOT NULL) " | ||
| "OR (schedule_type = 'location' AND start_time IS NULL " | ||
| "AND latitude IS NOT NULL AND longitude IS NOT NULL AND is_all_day = false)", | ||
| name="ck_schedules_schedule_type_requirements", | ||
| ), | ||
| sa.CheckConstraint( | ||
| "(schedule_kind = 'once' AND recurrence_rule IS NULL) " | ||
| "OR (schedule_kind = 'recurring' AND schedule_type = 'time' " | ||
| "AND recurrence_rule IS NOT NULL)", | ||
| name="ck_schedules_recurrence_requirements", | ||
| ), | ||
| sa.CheckConstraint( | ||
| "is_all_day = false " | ||
| "OR (schedule_type = 'time' AND start_time IS NOT NULL AND end_time IS NOT NULL)", | ||
| name="ck_schedules_all_day_requirements", | ||
| ), | ||
| sa.CheckConstraint( | ||
| "end_time IS NULL OR start_time IS NOT NULL", | ||
| name="ck_schedules_end_requires_start", | ||
| ), | ||
| sa.CheckConstraint( | ||
| "reminder_offset_minutes IS NULL OR reminder_offset_minutes >= 0", | ||
| name="ck_schedules_reminder_offset_nonnegative", | ||
| ), | ||
| sa.CheckConstraint( | ||
| "(reminder_type IS NULL AND reminder_trigger_at IS NULL " | ||
| "AND reminder_offset_minutes IS NULL AND reminder_strength IS NULL " | ||
| "AND reminder_disposition_state IS NULL) " | ||
| "OR (reminder_type IS NOT NULL AND reminder_strength IS NOT NULL)", | ||
| name="ck_schedules_reminder_presence", | ||
| ), | ||
| sa.CheckConstraint( | ||
| "reminder_type IS NULL " | ||
| "OR (reminder_type = 'at_time' AND reminder_trigger_at IS NOT NULL " | ||
| "AND reminder_offset_minutes IS NULL) " | ||
| "OR (reminder_type = 'before_start' AND reminder_trigger_at IS NULL " | ||
| "AND reminder_offset_minutes IS NOT NULL) " | ||
| "OR (reminder_type IN ('arrive_location', 'return_to_recorded_location') " | ||
| "AND reminder_trigger_at IS NULL AND reminder_offset_minutes IS NULL " | ||
| "AND latitude IS NOT NULL AND longitude IS NOT NULL)", | ||
| name="ck_schedules_reminder_configuration", | ||
| ), | ||
| sa.CheckConstraint( | ||
| "(status = 'active' AND deleted_at IS NULL) " | ||
| "OR (status = 'deleted' AND deleted_at IS NOT NULL)", | ||
| name="ck_schedules_deleted_at", | ||
| ), | ||
| ) | ||
|
|
||
|
|
||
| def _create_occurrence_overrides_table() -> None: | ||
| op.create_table( | ||
| "schedule_occurrence_overrides", | ||
| sa.Column("id", sa.String(length=64), primary_key=True, nullable=False), | ||
| sa.Column( | ||
| "schedule_id", | ||
| sa.String(length=64), | ||
| sa.ForeignKey("schedules.id", ondelete="RESTRICT"), | ||
| nullable=False, | ||
| ), | ||
| sa.Column("occurrence_start", sa.DateTime(timezone=True), nullable=False), | ||
| sa.Column("action", sa.String(length=16), nullable=False), | ||
| sa.Column( | ||
| "replacement_schedule_id", | ||
| sa.String(length=64), | ||
| sa.ForeignKey("schedules.id", ondelete="RESTRICT"), | ||
| nullable=True, | ||
| ), | ||
| sa.Column("created_at", sa.DateTime(timezone=True), nullable=False), | ||
| sa.Column("updated_at", sa.DateTime(timezone=True), nullable=False), | ||
| sa.CheckConstraint( | ||
| "action IN ('cancel', 'replace')", | ||
| name="ck_schedule_occurrence_overrides_action", | ||
| ), | ||
| sa.CheckConstraint( | ||
| "(action = 'cancel' AND replacement_schedule_id IS NULL) " | ||
| "OR (action = 'replace' AND replacement_schedule_id IS NOT NULL)", | ||
| name="ck_schedule_occurrence_overrides_replacement", | ||
| ), | ||
| sa.UniqueConstraint( | ||
| "schedule_id", | ||
| "occurrence_start", | ||
| name="uq_schedule_occurrence_overrides_schedule_occurrence", | ||
| ), | ||
| ) | ||
| op.create_index( | ||
| "ix_schedule_occurrence_overrides_replacement_schedule_id", | ||
| "schedule_occurrence_overrides", | ||
| ["replacement_schedule_id"], | ||
| ) | ||
|
|
||
|
|
||
| def upgrade() -> None: | ||
| """Migrate the legacy schedule rows and create occurrence overrides.""" | ||
| op.drop_index("ix_schedules_system_alarm_ref_id", table_name="schedules") | ||
| op.drop_index("ix_schedules_system_schedule_ref_id", table_name="schedules") | ||
| op.drop_index("ix_schedules_user_status_start_time", table_name="schedules") | ||
|
|
||
| _create_v3_schedules_table() | ||
| op.create_index( | ||
| "ix_schedules_account_status_start_time", | ||
| "schedules_v3", | ||
| ["account_id", "status", "start_time"], | ||
| ) | ||
| op.create_index( | ||
| "ix_schedules_account_revision", | ||
| "schedules_v3", | ||
| ["account_id", "revision"], | ||
| ) | ||
|
|
||
| op.execute( | ||
| sa.text( | ||
| """ | ||
| INSERT INTO schedules_v3 ( | ||
| id, account_id, schedule_type, schedule_kind, title, is_all_day, | ||
| start_time, end_time, timezone, recurrence_rule, location_name, | ||
| latitude, longitude, reminder_type, reminder_trigger_at, | ||
| reminder_offset_minutes, reminder_strength, | ||
| reminder_disposition_state, status, revision, created_at, | ||
| updated_at, deleted_at | ||
| ) | ||
| SELECT | ||
| left(id, 64), | ||
| left(user_id, 64), | ||
| schedule_type, | ||
| 'once', | ||
| left(title, 255), | ||
| false, | ||
| NULLIF(start_time, '')::timestamptz, | ||
| NULLIF(end_time, '')::timestamptz, | ||
| left(COALESCE(NULLIF(timezone, ''), 'UTC'), 64), | ||
| NULL, | ||
| left(location_name, 255), | ||
| latitude::numeric(9, 6), | ||
| longitude::numeric(9, 6), | ||
| NULL, | ||
| NULL, | ||
| NULL, | ||
| NULL, | ||
| NULL, | ||
| CASE WHEN status = 'deleted' THEN 'deleted' ELSE 'active' END, | ||
| 1, | ||
| COALESCE(NULLIF(created_at, '')::timestamptz, now()), | ||
| COALESCE(NULLIF(updated_at, '')::timestamptz, now()), | ||
| CASE | ||
| WHEN status = 'deleted' | ||
| THEN COALESCE(NULLIF(updated_at, '')::timestamptz, now()) | ||
| ELSE NULL | ||
| END | ||
| FROM schedules | ||
| """ | ||
| ) | ||
| ) | ||
|
|
||
| op.drop_table("schedules") | ||
| op.rename_table("schedules_v3", "schedules") | ||
| _create_occurrence_overrides_table() | ||
|
|
||
|
|
||
| def downgrade() -> None: | ||
| """Restore the legacy MVP schedule shape while retaining core row data.""" | ||
| op.create_table( | ||
| "schedules_v2", | ||
| sa.Column("id", sa.Text(), primary_key=True, nullable=False), | ||
| sa.Column("user_id", sa.Text(), nullable=False), | ||
| sa.Column("source_mode", sa.Text(), nullable=False), | ||
| sa.Column("schedule_type", sa.Text(), nullable=False), | ||
| sa.Column("status", sa.Text(), nullable=False), | ||
| sa.Column("title", sa.Text(), nullable=False), | ||
| sa.Column("notes", sa.Text(), nullable=True), | ||
| sa.Column("start_time", sa.Text(), nullable=True), | ||
| sa.Column("end_time", sa.Text(), nullable=True), | ||
| sa.Column("timezone", sa.Text(), nullable=True), | ||
| sa.Column("location_name", sa.Text(), nullable=True), | ||
| sa.Column("location_address", sa.Text(), nullable=True), | ||
| sa.Column("latitude", sa.Float(), nullable=True), | ||
| sa.Column("longitude", sa.Float(), nullable=True), | ||
| sa.Column("geofence_radius_meters", sa.Integer(), nullable=False), | ||
| sa.Column("geofence_armed", sa.Integer(), nullable=False), | ||
| sa.Column("time_remind_offset_minutes", sa.Integer(), nullable=False), | ||
| sa.Column("time_triggered_at", sa.Text(), nullable=True), | ||
| sa.Column("geo_triggered_at", sa.Text(), nullable=True), | ||
| sa.Column("system_schedule_ref_id", sa.Text(), nullable=True), | ||
| sa.Column("system_alarm_ref_id", sa.Text(), nullable=True), | ||
| sa.Column("created_at", sa.Text(), nullable=False), | ||
| sa.Column("updated_at", sa.Text(), nullable=False), | ||
| sa.CheckConstraint( | ||
| "source_mode IN ('manual', 'voice')", | ||
| name="ck_schedules_source_mode", | ||
| ), | ||
| sa.CheckConstraint( | ||
| "schedule_type IN ('time', 'location')", | ||
| name="ck_schedules_schedule_type", | ||
| ), | ||
| sa.CheckConstraint( | ||
| "status IN ('scheduled', 'done', 'deleted')", | ||
| name="ck_schedules_status", | ||
| ), | ||
| sa.CheckConstraint( | ||
| "geofence_armed IN (0, 1)", | ||
| name="ck_schedules_geofence_armed", | ||
| ), | ||
| sa.CheckConstraint( | ||
| "geofence_radius_meters > 0", | ||
| name="ck_schedules_geofence_radius_positive", | ||
| ), | ||
| sa.CheckConstraint( | ||
| "time_remind_offset_minutes >= 0", | ||
| name="ck_schedules_time_remind_offset_nonnegative", | ||
| ), | ||
| sa.CheckConstraint( | ||
| "latitude IS NULL OR latitude BETWEEN -90 AND 90", | ||
| name="ck_schedules_latitude_range", | ||
| ), | ||
| sa.CheckConstraint( | ||
| "longitude IS NULL OR longitude BETWEEN -180 AND 180", | ||
| name="ck_schedules_longitude_range", | ||
| ), | ||
| sa.CheckConstraint( | ||
| "(schedule_type = 'time' AND start_time IS NOT NULL) " | ||
| "OR (schedule_type = 'location' AND start_time IS NULL " | ||
| "AND latitude IS NOT NULL AND longitude IS NOT NULL)", | ||
| name="ck_schedules_schedule_type_requirements", | ||
| ), | ||
| sa.CheckConstraint( | ||
| "end_time IS NULL OR start_time IS NOT NULL", | ||
| name="ck_schedules_end_requires_start", | ||
| ), | ||
| ) | ||
|
|
||
| op.execute( | ||
| sa.text( | ||
| """ | ||
| INSERT INTO schedules_v2 ( | ||
| id, user_id, source_mode, schedule_type, status, title, notes, | ||
| start_time, end_time, timezone, location_name, location_address, | ||
| latitude, longitude, geofence_radius_meters, geofence_armed, | ||
| time_remind_offset_minutes, time_triggered_at, geo_triggered_at, | ||
| system_schedule_ref_id, system_alarm_ref_id, created_at, updated_at | ||
| ) | ||
| SELECT | ||
| id, | ||
| account_id, | ||
| 'voice', | ||
| schedule_type, | ||
| CASE WHEN status = 'deleted' THEN 'deleted' ELSE 'scheduled' END, | ||
| title, | ||
| NULL, | ||
| start_time::text, | ||
| end_time::text, | ||
| timezone, | ||
| location_name, | ||
| NULL, | ||
| latitude::double precision, | ||
| longitude::double precision, | ||
| 100, | ||
| 0, | ||
| 0, | ||
| NULL, | ||
| NULL, | ||
| NULL, | ||
| NULL, | ||
| created_at::text, | ||
| updated_at::text | ||
| FROM schedules | ||
| """ | ||
| ) | ||
| ) | ||
|
|
||
| op.drop_index( | ||
| "ix_schedule_occurrence_overrides_replacement_schedule_id", | ||
| table_name="schedule_occurrence_overrides", | ||
| ) | ||
| op.drop_table("schedule_occurrence_overrides") | ||
| op.drop_table("schedules") | ||
| op.rename_table("schedules_v2", "schedules") | ||
| op.create_index( | ||
| "ix_schedules_user_status_start_time", | ||
| "schedules", | ||
| ["user_id", "status", "start_time"], | ||
| ) | ||
| op.create_index( | ||
| "ix_schedules_system_schedule_ref_id", | ||
| "schedules", | ||
| ["system_schedule_ref_id"], | ||
| ) | ||
| op.create_index( | ||
| "ix_schedules_system_alarm_ref_id", | ||
| "schedules", | ||
| ["system_alarm_ref_id"], | ||
| ) | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[P1] Preserve legacy identifiers during migration
left(id, 64)silently truncates the legacy primary key before inserting it into the new table. The old column is unboundedText, so any existing identifier longer than 64 characters is changed, and two IDs sharing the first 64 characters will collide and abort the migration. Please validate/reject overlong IDs or migrate the full value rather than truncating it (the same concern applies touser_idon the next line).