Merge pull request #12 from joshpollara/feature/webapp-refactor

Refactor webapp: Remove authentication and simplify architecture

Author: joshpollara

Dockerfile

@@ -25,6 +25,8 @@ RUN mkdir -p /app/data
 RUN echo "0 */6 * * * cd /app && /usr/local/bin/python /app/bin/bridge_openings_sync.py >> /var/log/cron.log 2>&1" > /etc/cron.d/bridge-sync && \
     echo "0 2 * * 0 cd /app && /usr/local/bin/python /app/bin/fetch_osm_bridges.py >> /var/log/cron.log 2>&1" >> /etc/cron.d/bridge-sync && \
     echo "0 3 * * 0 cd /app && /usr/local/bin/python /app/bin/enhance_bridge_locations.py >> /var/log/cron.log 2>&1" >> /etc/cron.d/bridge-sync && \
+    echo "30 3 * * 0 cd /app && /usr/local/bin/python /app/webapp/run_migration.py >> /var/log/cron.log 2>&1" >> /etc/cron.d/bridge-sync && \
+    echo "30 */6 * * * cd /app && /usr/local/bin/python /app/webapp/run_migration.py >> /var/log/cron.log 2>&1" >> /etc/cron.d/bridge-sync && \
     chmod 0644 /etc/cron.d/bridge-sync && \
     crontab /etc/cron.d/bridge-sync && \
     touch /var/log/cron.log

webapp/auth.py

@@ -16,26 +16,26 @@
 
 Base = declarative_base()
 
-class User(Base):
-    __tablename__ = "users"
+# URL-based watchlist models
+class Watchlist(Base):
+    __tablename__ = "watchlists"
 
     id = Column(Integer, primary_key=True, index=True)
-    email = Column(String, unique=True, index=True, nullable=False)
-    hashed_password = Column(String, nullable=False)
-    calendar_token = Column(String, unique=True, index=True)
+    name = Column(String, unique=True, index=True, nullable=False)
+    created_at = Column(DateTime, default=datetime.utcnow)
 
-    watched_bridges = relationship("WatchedBridge", back_populates="user", cascade="all, delete-orphan")
+    bridges = relationship("WatchlistBridge", back_populates="watchlist", cascade="all, delete-orphan")
 
-class WatchedBridge(Base):
-    __tablename__ = "watched_bridges"
+class WatchlistBridge(Base):
+    __tablename__ = "watchlist_bridges"
 
     id = Column(Integer, primary_key=True, index=True)
-    user_id = Column(Integer, ForeignKey("users.id"), nullable=False)
+    watchlist_id = Column(Integer, ForeignKey("watchlists.id"), nullable=False)
     bridge_name = Column(String, nullable=False)
-    bridge_id = Column(Integer, nullable=True)  # Reference to bridges table
+    bridge_id = Column(String, nullable=True)  # Reference to bridges table
     created_at = Column(DateTime, default=datetime.utcnow)
 
-    user = relationship("User", back_populates="watched_bridges")
+    watchlist = relationship("Watchlist", back_populates="bridges")
 
 def get_db():
     db = SessionLocal()

webapp/database.py

@@ -2,7 +2,7 @@
 from typing import List, Dict
 import hashlib
 
-def generate_ical_feed(user_email: str, events: List[Dict]) -> str:
+def generate_ical_feed(events: List[Dict], calendar_name: str = "BridgePing") -> str:
     """Generate iCalendar feed for bridge opening events."""
 
     # iCal header
@@ -12,8 +12,8 @@ def generate_ical_feed(user_email: str, events: List[Dict]) -> str:
         "PRODID:-//BridgePing//Bridge Opening Calendar//EN",
         "CALSCALE:GREGORIAN",
         "METHOD:PUBLISH",
-        f"X-WR-CALNAME:Bridge Openings - {user_email}",
-        "X-WR-CALDESC:Scheduled bridge openings for your watched bridges",
+        f"X-WR-CALNAME:{calendar_name}",
+        "X-WR-CALDESC:Scheduled bridge openings",
         "X-WR-TIMEZONE:Europe/Amsterdam",
         "REFRESH-INTERVAL;VALUE=DURATION:PT1H",  # Refresh every hour
     ]
@@ -42,7 +42,8 @@ def generate_ical_feed(user_email: str, events: List[Dict]) -> str:
     # Add events
     for event in events:
         # Generate unique ID for this event
-        uid_string = f"{event['bridge_name']}-{event['start_time']}-{event['location_key']}"
+        location_key = event.get('location_key', '')
+        uid_string = f"{event['bridge_name']}-{event['start_time']}-{location_key}"
         uid = hashlib.md5(uid_string.encode()).hexdigest()
 
         # Format times for iCal