From 00938496dfd9aa42e9cbb0c0b55c742508020c14 Mon Sep 17 00:00:00 2001
From: pheonix8 <61965711+pheonix8@users.noreply.github.com>
Date: Wed, 4 Jun 2025 18:28:20 +0200
Subject: [PATCH 1/2] fix docker-compose.prod.yml & get plans order

---
 docker-compose.prod.yml              |  3 ++-
 service/app/services/plan_service.py | 11 +++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 2c9a949..f229cdf 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -37,7 +37,8 @@ services:
       - "traefik.http.routers.backend.tls=true"
       - "traefik.http.routers.backend.tls.certresolver=cloudflare"
       - "traefik.http.routers.backend.service=backend"
-      - "traefik.http.middlewares.stripPrefix.stripPrefix.prefixes=/api"
+      - "traefik.http.routers.backend.middlewares=api-middleware@docker"
+      - "traefik.http.middlewares.api-middleware.stripprefix.prefixes=/api"
       - "traefik.http.services.backend.loadbalancer.server.port=80"
       - "traefik.docker.network=proxy"
   postgres-db:
diff --git a/service/app/services/plan_service.py b/service/app/services/plan_service.py
index d02f1a0..ea14f82 100644
--- a/service/app/services/plan_service.py
+++ b/service/app/services/plan_service.py
@@ -23,13 +23,18 @@ def get_plans(user_id: UUID, session: Session) -> Sequence[PlanRead]:
             and_(Plan.group_version_id == subquery.c.group_version_id, Plan.created_at == subquery.c.max_created_at),
         )
         .where(Plan.user_id == user_id)
+        .order_by(Plan.bookmark.desc(), Plan.name)
     )
     plans = session.exec(statement).all()
     return [PlanRead.model_validate(plan) for plan in plans]
 
 
 def get_plan_by_public_slug(public_slug: str, session: Session) -> PlanRead:
-    statement = select(Plan).where(Plan.public_slug == public_slug).order_by(Plan.created_at.desc())
+    statement = (
+        select(Plan)
+        .where(Plan.public_slug == public_slug)
+        .order_by(Plan.created_at.desc())
+    )
     plan = session.exec(statement).first()
     if not plan:
         error_msg = "Plan not found"
@@ -40,7 +45,9 @@ def get_plan_by_public_slug(public_slug: str, session: Session) -> PlanRead:
 def get_plan_history(plan_id: UUID, session: Session) -> Sequence[PlanRead]:
     current_plan = session.get(Plan, plan_id)
     statement = (
-        select(Plan).where(Plan.group_version_id == current_plan.group_version_id).order_by(Plan.created_at.desc())
+        select(Plan)
+        .where(Plan.group_version_id == current_plan.group_version_id)
+        .order_by(Plan.created_at.desc())
     )
     plans = session.exec(statement).all()
     return [PlanRead.model_validate(plan) for plan in plans]

From c36587cc88c2b3d7181fd4eebcb7c585aa8a84b3 Mon Sep 17 00:00:00 2001
From: pheonix8 <61965711+pheonix8@users.noreply.github.com>
Date: Wed, 4 Jun 2025 18:38:40 +0200
Subject: [PATCH 2/2] fix formating

---
 service/app/services/plan_service.py | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/service/app/services/plan_service.py b/service/app/services/plan_service.py
index ea14f82..d70ce57 100644
--- a/service/app/services/plan_service.py
+++ b/service/app/services/plan_service.py
@@ -30,11 +30,7 @@ def get_plans(user_id: UUID, session: Session) -> Sequence[PlanRead]:
 
 
 def get_plan_by_public_slug(public_slug: str, session: Session) -> PlanRead:
-    statement = (
-        select(Plan)
-        .where(Plan.public_slug == public_slug)
-        .order_by(Plan.created_at.desc())
-    )
+    statement = select(Plan).where(Plan.public_slug == public_slug).order_by(Plan.created_at.desc())
     plan = session.exec(statement).first()
     if not plan:
         error_msg = "Plan not found"
@@ -45,9 +41,7 @@ def get_plan_by_public_slug(public_slug: str, session: Session) -> PlanRead:
 def get_plan_history(plan_id: UUID, session: Session) -> Sequence[PlanRead]:
     current_plan = session.get(Plan, plan_id)
     statement = (
-        select(Plan)
-        .where(Plan.group_version_id == current_plan.group_version_id)
-        .order_by(Plan.created_at.desc())
+        select(Plan).where(Plan.group_version_id == current_plan.group_version_id).order_by(Plan.created_at.desc())
     )
     plans = session.exec(statement).all()
     return [PlanRead.model_validate(plan) for plan in plans]