Merge pull request #58 from kilobyteno/develop

Author: dsbilling

.github/workflows/release.yml

@@ -2,7 +2,7 @@ name: "Release"
 
 on:
     release:
-        types: [ released ]
+        types: [ published ]
 
 jobs:
     update-changelog:
@@ -11,7 +11,7 @@ jobs:
             -   name: Checkout code
                 uses: actions/checkout@v4
                 with:
-                    ref: main
+                    ref: develop
 
             -   name: Update Changelog
                 uses: stefanzweifel/changelog-updater-action@v1

backend/alembic/versions/9ef2bf852502_add_event_interest.py

@@ -0,0 +1,42 @@
+"""Add event interest
+
+Revision ID: 9ef2bf852502
+Revises: 8430b1ac53fe
+Create Date: 2024-12-29 16:53:42.535531
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = '9ef2bf852502'
+down_revision: Union[str, None] = '8430b1ac53fe'
+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! ###
+    op.create_table('event_interests',
+        sa.Column('id', sa.UUID(), nullable=False),
+        sa.Column('event_id', sa.UUID(), nullable=False),
+        sa.Column('user_id', sa.UUID(), nullable=False),
+        sa.Column('status', sa.Integer(), nullable=False),
+        sa.Column('created_at', sa.DateTime(), server_default=sa.text('now()'), nullable=True),
+        sa.Column('updated_at', sa.DateTime(), nullable=True),
+        sa.Column('deleted_at', sa.DateTime(), nullable=True),
+        sa.ForeignKeyConstraint(['event_id'], ['events.id'], ),
+        sa.ForeignKeyConstraint(['user_id'], ['users.id'], ),
+        sa.PrimaryKeyConstraint('id'),
+        sa.UniqueConstraint('id')
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('event_interests')
+    # ### end Alembic commands ###

backend/app/models/__init__.py

@@ -1 +1 @@
-from app.models import base, event, organisation, user  # noqa: F401
+from app.models import base, event, event_interest, organisation, user  # noqa: F401

backend/app/models/event_interest.py

@@ -1,8 +1,10 @@
 from sqlalchemy import UUID, Column, ForeignKey, Integer
-from sqlalchemy.orm import relationship
+from sqlalchemy.orm import declarative_base, relationship
 
 from app.models.base import BaseModel
 
+Base = declarative_base()
+
 
 class EventInterest(BaseModel):
     """Event interest model - tracks user's interest in attending an event"""

backend/app/v3/api.py

@@ -17,5 +17,5 @@
 router.include_router(user_endpoints.router, tags=['user'], prefix='/user')
 router.include_router(organisations_endpoints.router, tags=['organisations'], prefix='/organisations')
 router.include_router(events_endpoints.router, tags=['events'], prefix='/events')
-router.include_router(event_interests_endpoints.router, tags=['event interests'], prefix='/event-interests')
+router.include_router(event_interests_endpoints.router, tags=['event interests'])
 router.include_router(system_endpoints.router, tags=['system'], prefix='/system')  # Should be last

backend/app/v3/event_interests/endpoints.py

@@ -21,7 +21,7 @@
 
 
 @router.post(
-    '/{event_id}',
+    '/events/{event_id}/interests',
     name='EI-1',
     response_model=EventInterestResponse,
 )
@@ -33,7 +33,7 @@ async def post_create_interest(
 
 
 @router.get(
-    '/{event_id}',
+    '/events/{event_id}/interests',
     name='EI-2',
     response_model=List[EventInterestResponse],
 )
@@ -43,7 +43,7 @@ async def get_interests_list(event_id: UUID, skip: int = 0, limit: int = 100, db
 
 
 @router.put(
-    '/{event_id}',
+    '/events/{event_id}/interests',
     name='EI-3',
     response_model=EventInterestResponse,
 )
@@ -55,7 +55,7 @@ async def put_update_interest(
 
 
 @router.get(
-    '/{event_id}/me',
+    '/events/{event_id}/interests/me',
     name='EI-4',
     response_model=EventInterestResponse,
 )
@@ -64,7 +64,7 @@ async def get_my_interest(event_id: UUID, current_user: User = Depends(get_curre
     return get_user_interest(db=db, event_id=event_id, current_user=current_user)
 
 
-@router.get('/{event_id}/count', name='EI-5', response_model=EventInterestCountResponse)
+@router.get('/events/{event_id}/interests/count', name='EI-5', response_model=EventInterestCountResponse)
 async def get_interest_count(event_id: UUID, db: Session = Depends(get_db)) -> JSONResponse:
     """Get count of interests for an event"""
     return get_event_interest_count(db=db, event_id=event_id)

docker-compose.yml

@@ -0,0 +1,83 @@
+version: '3.8'
+
+services:
+  frontend:
+    build:
+      context: ./frontend
+      dockerfile: Dockerfile
+      args:
+        - BUILD_ENV=${BUILD_ENV:-production}
+    ports:
+      - "${FRONTEND_PORT:-8080}:8080"
+    environment:
+      - VITE_ENV=${VITE_ENV:-production}
+      - VITE_CORE_API_URL=${VITE_CORE_API_URL:-http://backend:8000/v3}
+    networks:
+      - app-network
+    depends_on:
+      - backend
+    restart: unless-stopped
+    healthcheck:
+      test: ["CMD", "wget", "--spider", "-q", "http://localhost:8080"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+
+  backend:
+    build:
+      context: ./backend
+      dockerfile: Dockerfile
+    ports:
+      - "${BACKEND_PORT:-8000}:8000"
+    environment:
+      - DB_HOST=${DB_HOST:-db}
+      - DB_USERNAME=${DB_USERNAME:-postgres}
+      - DB_PASSWORD=${DB_PASSWORD}
+      - DB_PORT=${DB_PORT:-5432}
+      - DB_DIALECT=${DB_DIALECT:-postgresql}
+      - DB_NAME=${DB_NAME:-postgres}
+      - ENV=${ENV:-production}
+    depends_on:
+      db:
+        condition: service_healthy
+    restart: unless-stopped
+    networks:
+      - app-network
+      - db-network
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:8000/v3/system/up"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+
+  db:
+    build:
+      context: ./postgres
+      dockerfile: Dockerfile
+    ports:
+      - "${DB_PORT:-5432}:5432"
+    environment:
+      - POSTGRES_USER=${DB_USERNAME:-postgres}
+      - POSTGRES_PASSWORD=${DB_PASSWORD}
+      - POSTGRES_DB=${DB_NAME:-postgres}
+      - POSTGRES_HOST_AUTH_METHOD=${POSTGRES_HOST_AUTH_METHOD:-trust}
+    volumes:
+      - postgres_data:/var/lib/postgresql/data
+    networks:
+      - db-network
+    restart: unless-stopped
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+
+networks:
+  app-network:
+    driver: bridge
+  db-network:
+    driver: bridge
+
+volumes:
+  postgres_data:
+    driver: local

frontend/src/components/nav-user.tsx

@@ -20,7 +20,7 @@ import {
     SidebarMenuItem,
     useSidebar,
 } from "@/components/ui/sidebar"
-import {CaretUpDown, Password, SignOut, UserSwitch} from "@phosphor-icons/react";
+import {CaretUpDown, SignOut, UserSwitch} from "@phosphor-icons/react";
 import {useAuth} from "@/context/AuthContext";
 import {useTranslation} from "react-i18next";
 import {RouteConfig} from "@/routes/route-config";

frontend/src/lib/api/client.ts

@@ -140,7 +140,7 @@ apiClient.interceptors.response.use(
         }
 
         // Show error toast for all other errors
-        if (error.response?.status !== 401) {
+        if (error.response?.status !== 401 && error.response?.status !== 404) {
             toast({
                 title: "Error",
                 description: getErrorMessage(error),

frontend/src/lib/api/event-interest.ts

@@ -21,9 +21,9 @@ export type EI4Output = ApiResponse<EventInterest>;
 export type EI5Output = ApiResponse<EventInterestCount>;
 
 export const eventInterestApi = {
-    create: (event_id: string, data: EventInterest) => apiClient.post<EI1Output>(`/event-interests/${event_id}`, data),
-    get: (event_id: string) => apiClient.get<EI2Output>(`/event-interests/${event_id}`),
-    update: (event_id: string, data: EventInterest) => apiClient.put<EI3Output>(`/event-interests/${event_id}`, data),
-    getMe: (event_id: string) => apiClient.get<EI4Output>(`/event-interests/${event_id}/me`),
-    getCount: (event_id: string) => apiClient.get<EI5Output>(`/event-interests/${event_id}/count`),
-};
+    create: (event_id: string, data: EventInterest) => apiClient.post<EI1Output>(`/events/${event_id}/interests`, data),
+    get: (event_id: string) => apiClient.get<EI2Output>(`/events/${event_id}/interests`),
+    update: (event_id: string, data: EventInterest) => apiClient.put<EI3Output>(`/events/${event_id}/interests`, data),
+    getMe: (event_id: string) => apiClient.get<EI4Output>(`/events/${event_id}/interests/me`),
+    getCount: (event_id: string) => apiClient.get<EI5Output>(`/events/${event_id}/interests/count`),
+};