ROADMAP v0.1.5

.github/workflows/ci.yml

@@ -0,0 +1,65 @@
+name: Django CI
+
+on:
+  push:
+    branches: ["main", "master", "develop"]
+  pull_request:
+    branches: ["main", "master", "develop"]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    services:
+      postgres:
+        image: postgres:15
+        env:
+          POSTGRES_DB: django_test
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+        ports:
+          - 5432:5432
+        options: >-
+          --health-cmd="pg_isready -U postgres"
+          --health-interval=5s
+          --health-timeout=5s
+          --health-retries=10
+
+    env:
+      DJANGO_SETTINGS_MODULE: Fools_Arena.settings
+      POSTGRES_DB: django_test
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
+      POSTGRES_HOST: localhost
+      POSTGRES_PORT: 5432
+      DATABASE_URL: postgres://postgres:postgres@localhost:5432/django_test
+      PYTHONPATH: .
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r requirements.txt
+      - name: Wait for PostgreSQL to be ready
+        run: |
+          echo "Waiting for PostgreSQL to accept connections..."
+          for i in {1..10}; do
+            pg_isready -h localhost -p 5432 -U postgres && break
+            echo "PostgreSQL not ready yet, retrying in 3 seconds..."
+            sleep 3
+          done
+
+      - name: Run migrations
+        run: |
+          python manage.py migrate --noinput
+
+      - name: Run tests
+        run: |
+          pytest -v --disable-warnings

.gitignore

@@ -111,6 +111,7 @@ celerybeat.pid
 *.sql.gz
 *.dump
 *.backup
+backup*
 
 # =========================
 # Docker

Docs/Database/dbschema.puml

@@ -0,0 +1,210 @@
+@startuml
+' === LOOKUP TABLES ===
+
+entity "CardSuit" as CardSuit {
+  *id : smallint
+  ---
+  name : varchar
+  color : ENUM(red, black)
+}
+
+entity "CardRank" as CardRank {
+  *id : smallint
+  ---
+  name : varchar
+  value : int
+}
+
+' === CORE ENTITIES ===
+
+entity "User" as User {
+  *id : UUID
+  ---
+  username : varchar
+  email : varchar
+  password_hash : varchar
+  avatar_url : varchar?
+  created_at : timestamp
+}
+
+entity "Lobby" as Lobby {
+  *id : UUID
+  ---
+  name : varchar
+  owner_id : UUID [FK → User.id]
+  is_private : bool
+  password_hash : varchar?
+  status : ENUM(waiting, playing, closed)
+  created_at : timestamp
+}
+
+entity "LobbySettings" as LobbySettings {
+  *id : UUID
+  ---
+  lobby_id : UUID [FK → Lobby.id]
+  max_players : int
+  card_count : ENUM(24, 36, 52)
+  is_transferable : bool
+  neighbor_throw_only : bool
+  allow_jokers : bool
+  turn_time_limit : int?
+  special_rule_set_id : UUID [FK → SpecialRuleSet.id]?
+}
+
+entity "LobbyPlayer" as LobbyPlayer {
+  *id : UUID
+  ---
+  lobby_id : UUID [FK → Lobby.id]
+  user_id : UUID [FK → User.id]
+  status : ENUM(waiting, ready, playing, left)
+}
+
+entity "Game" as Game {
+  *id : UUID
+  ---
+  lobby_id : UUID [FK → Lobby.id]
+  trump_card_id : UUID [FK → Card.id]
+  started_at : timestamp
+  finished_at : timestamp?
+  status : ENUM(in_progress, finished)
+  loser_id : UUID [FK → User.id]?
+}
+
+entity "GamePlayer" as GamePlayer {
+  *id : UUID
+  ---
+  game_id : UUID [FK → Game.id]
+  user_id : UUID [FK → User.id]
+  seat_position : int
+  cards_remaining : int
+}
+
+entity "Card" as Card {
+  *id : UUID
+  ---
+  suit_id : smallint [FK → CardSuit.id]
+  rank_id : smallint [FK → CardRank.id]
+  special_card_id : UUID? [FK → SpecialCard.id]
+}
+
+' === CARD STATES ===
+
+entity "GameDeck" as GameDeck {
+  *id : UUID
+  ---
+  game_id : UUID [FK → Game.id]
+  card_id : UUID [FK → Card.id]
+  position : int
+}
+
+entity "PlayerHand" as PlayerHand {
+  *id : UUID
+  ---
+  game_id : UUID [FK → Game.id]
+  player_id : UUID [FK → User.id]
+  card_id : UUID [FK → Card.id]
+  order_in_hand : int?
+}
+
+entity "TableCard" as TableCard {
+  *id : UUID
+  ---
+  game_id : UUID [FK → Game.id]
+  attack_card_id : UUID [FK → Card.id]
+  defense_card_id : UUID? [FK → Card.id]
+}
+
+entity "DiscardPile" as DiscardPile {
+  *id : UUID
+  ---
+  game_id : UUID [FK → Game.id]
+  card_id : UUID [FK → Card.id]
+  position : int?
+}
+
+' === RULES ===
+
+entity "SpecialRuleSet" as SpecialRuleSet {
+  *id : UUID
+  ---
+  name : varchar
+  description : text?
+  min_players : int
+}
+
+entity "SpecialCard" as SpecialCard {
+  *id : UUID
+  ---
+  name : varchar
+  effect_type : ENUM(skip, reverse, draw, custom)
+  effect_value : jsonb?
+  description : text?
+}
+
+entity "SpecialRuleSetCard" as SpecialRuleSetCard {
+  *id : UUID
+  ---
+  rule_set_id : UUID [FK → SpecialRuleSet.id]
+  card_id : UUID [FK → SpecialCard.id]
+}
+
+' === GAME FLOW ===
+
+entity "Turn" as Turn {
+  *id : UUID
+  ---
+  game_id : UUID [FK → Game.id]
+  player_id : UUID [FK → User.id]
+  turn_number : int
+}
+
+entity "Move" as Move {
+  *id : UUID
+  ---
+  turn_id : UUID [FK → Turn.id]
+  table_card_id : UUID [FK → TableCard.id]
+  action_type : ENUM(attack, defend, pickup)
+  created_at : timestamp
+}
+
+entity "Message" as Message {
+  *id : UUID
+  ---
+  sender_id : UUID [FK → User.id]
+  receiver_id : UUID? [FK → User.id]
+  lobby_id : UUID? [FK → Lobby.id]
+  content : text
+  sent_at : timestamp
+}
+
+' === RELATIONSHIPS ===
+
+User ||--o{ Lobby
+User ||--o{ LobbyPlayer
+User ||--o{ Message
+User ||--o{ GamePlayer
+Lobby ||--|| LobbySettings
+Lobby ||--o{ LobbyPlayer
+Lobby ||--o{ Game
+Lobby ||--o{ Message
+Game ||--o{ GamePlayer
+Game ||--o{ Turn
+Game ||--|| Card : trump >
+Game ||--o{ GameDeck
+Game ||--o{ PlayerHand
+Game ||--o{ TableCard
+Game ||--o{ DiscardPile
+Game ||--|| User : loser >
+Turn ||--o{ Move
+TableCard ||--o{ Move
+CardSuit ||--o{ Card
+CardRank ||--o{ Card
+Card ||--o{ GameDeck
+Card ||--o{ PlayerHand
+Card ||--o{ TableCard
+Card ||--o{ DiscardPile
+SpecialRuleSet ||--o{ LobbySettings
+SpecialRuleSet ||--o{ SpecialRuleSetCard
+SpecialCard ||--o{ SpecialRuleSetCard
+SpecialCard ||--o{ Card
+@enduml

Fools_Arena/settings.py

@@ -48,7 +48,7 @@
 
 # WebSockets
 INSTALLED_APPS += ['channels']
-ASGI_APPLICATION = 'myproject.asgi.application'
+ASGI_APPLICATION = 'Fools_Arena.asgi.application'
 
 CHANNEL_LAYERS = {
     "default": {
@@ -119,6 +119,7 @@
     },
 ]
 
+AUTH_USER_MODEL = 'accounts.User'
 
 # Internationalization
 # https://docs.djangoproject.com/en/5.2/topics/i18n/
@@ -136,6 +137,7 @@
 # https://docs.djangoproject.com/en/5.2/howto/static-files/
 
 STATIC_URL = "static/"
+STATIC_ROOT = BASE_DIR / 'staticfiles'
 
 # Default primary key field type
 # https://docs.djangoproject.com/en/5.2/ref/settings/#default-auto-field

Fools_Arena/urls.py

@@ -16,8 +16,22 @@
 """
 
 from django.contrib import admin
-from django.urls import path
+from django.conf import settings
+from django.conf.urls.static import static
+from django.http import HttpResponse
+from django.shortcuts import redirect
+from django.urls import path, include
 
 urlpatterns = [
     path("admin/", admin.site.urls),
+# UI
+    path('accounts/', include('accounts.urls')),
+
+    # API
+    path('api/accounts/', include('accounts.api_urls')),
+
 ]
+
+# Add static files
+urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
+

README.md

@@ -23,28 +23,32 @@ Available services:
 - Django + Channels: http://localhost:8000
 - PostgreSQL: localhost:5432
 
-### 4. Apply migrations and create superuser
+### 4. Apply migrations and create a superuser
 Run migrations:
 ```bash
-docker-compose exec web python manage.py migrate
+docker compose exec web python manage.py migrate
 ```
 Create a superuser (optional):
 ```bash
-docker-compose exec web python manage.py createsuperuser
+docker compose exec web python manage.py createsuperuser
 ```
 
+### 5. Generate static files
+```bash
+docker compose exec web python manage.py collectstatic
+```
 
-### 5. Work with Django
+### 6. Work with Django
 All commands should be executed inside the web container. Examples:
 ```bash
-docker-compose exec web python manage.py shell
-docker-compose exec web python manage.py makemigrations
-docker-compose exec web python manage.py test
+docker compose exec web python manage.py shell
+docker compose exec web python manage.py makemigrations
+docker compose exec web pytest -v 
 ```
 
-### 6. Stop containers
+### 7. Stop containers
 ```bash
-docker-compose down
+docker compose down
 ```
 ---
 
@@ -59,7 +63,7 @@ docker-compose down
 
 ## 📌 Status
 Early development stage.  
-See [ROADMAP.md](./ROADMAP.md) for roadmap.  
+See [ROADMAP.md](./ROADMAP.md) for the roadmap.  
 
 ---