make project work and improve on features

.env-example

@@ -0,0 +1,25 @@
+# Django Settings
+DJANGO_SECRET_KEY=django-insecure-placeholder-change-this-in-production
+DJANGO_DEBUG=False
+# User credentials for first admin
+DJANGO_DEFAULT_ADMIN_EMAIL=example@gmail.com
+DJANGO_DEFAULT_ADMIN_USERNAME=admin
+DJANGO_DEFAULT_ADMIN_PASSWORD=admin_password
+
+# Database Settings (for Docker Compose and Django)
+POSTGRES_DB=ilotalo
+POSTGRES_USER=leppis
+POSTGRES_PASSWORD=leppis_password
+POSTGRES_HOST=db
+POSTGRES_PORT=5432
+
+# Mapping for existing settings.py logic
+TEST_DB_NAME=ilotalo
+TEST_DB_USER=leppis
+TEST_DB_PASSWORD=leppis_password
+TEST_DB_HOST=db
+TEST_DB_PORT=5432
+
+# Frontend Settings
+SITE_KEY=your_site_key_placeholder
+API_URL=http://api:8000  # Backend service URL for nginx proxy

.github/copilot-instructions.md

@@ -0,0 +1,144 @@
+# AI Coding Agent Instructions for Klusteri Website
+
+## Project Overview
+This is a full-stack web application for managing a student housing association (Klusteri). It handles reservations, cleaning schedules, night watch responsibilities, defect reporting, and organization management.
+
+**Tech Stack:**
+- Backend: Django REST Framework with PostgreSQL
+- Frontend: React with Vite, Material-UI, Axios
+- Testing: pytest (backend), Jest + Cypress (frontend)
+- Deployment: Docker Compose
+- Auth: JWT tokens
+
+## Architecture Patterns
+
+### API Structure
+- Base URL: `/api/`
+- Authentication: `/api/token/` (obtain), `/api/token/refresh/`
+- Resources follow REST conventions:
+  - List: `GET /api/listobjects/{resource}/`
+  - Create: `POST /api/{resource}/create_{resource}`
+  - Update: `PUT /api/{resource}/update_{resource}/{id}/`
+  - Delete: `DELETE /api/{resource}/delete_{resource}/{id}/`
+
+### Data Models
+- **User**: Custom model with roles (1-5), keys access, reservation rights
+- **Organization**: Student organizations with email, homepage, color
+- **Event**: Reservations with start/end, room, organizer (FK to Organization)
+- **NightResponsibility**: YKV (night watch) shifts with login/logout tracking
+- **DefectFault**: Maintenance issues with repair tracking
+- **Cleaning**: Weekly cleaning assignments between organizations
+- **CleaningSupplies**: Inventory of cleaning tools
+
+### Frontend Organization
+- Components in `src/components/` - reusable UI elements
+- Pages in `src/pages/` - route-based components
+- API calls centralized in `src/api/api.ts`
+- State management via Context Provider (`src/context/ContextProvider.jsx`)
+- Internationalization with react-i18next
+
+## Development Workflows
+
+### Backend Setup
+```bash
+cd backend
+poetry install
+poetry shell
+python manage.py migrate
+python manage.py runserver  # Development only
+# For production: gunicorn backend.wsgi:application --bind 0.0.0.0:8000
+```
+
+### Frontend Setup
+```bash
+cd frontend
+npm install
+npm run dev
+```
+
+### Testing
+- Backend: `cd backend && poetry run pytest`
+- Frontend unit: `cd frontend && npm test`
+- E2E: `cd frontend && npx cypress open`
+- Coverage: `poetry run coverage run --branch -m pytest && coverage report`
+
+### Backend Testing Tips
+- **Run in Docker**: If local environment setup is complex, run tests inside the container:
+  ```bash
+  docker exec ilotalo-new-api-1 pytest tests/test_views.py -n auto
+  ```
+- **Test Settings**: Pytest uses `backend/test_settings.py` (via `pytest.ini`). This enables `TESTING = True`.
+- **Database**: Django's `TestCase` automatically handles database creation/tear-down and wraps tests in transactions.
+- **Mocking**: Use `unittest.mock.patch` for external APIs (like reCAPTCHA) or signals.
+- **iCal Testing**: Use the `icalendar` library to parse and verify `.ics` responses.
+- **Model Creation**: Ensure all required fields are provided. E.g., `User.objects.create_user` requires `username`, `email`, `password`, `telegram`, and `role`.
+- **Signal Testing**: When testing `AppConfig.ready()`, remember it's called once at startup. Use fresh instances or patch `sys.argv`/modules to simulate different environments.
+
+### Docker Development
+```bash
+docker-compose -f docker-compose-dev.yml up --build
+```
+
+### Docker Production
+```bash
+docker-compose -f docker-compose-prod.yml up --build
+```
+
+## Code Conventions
+
+### Backend
+- Use Poetry for dependency management (not pip)
+- Models inherit from Django's base classes
+- Views extend DRF's APIView or generics
+- Database: PostgreSQL in prod/dev, conditional logic in settings.py
+- Scheduler: django-apscheduler for automated tasks
+
+### Frontend
+- JSX files with .jsx extension
+- Axios instance configured in `src/axios.js`
+- Material-UI components with Emotion styling
+- Translation keys in `src/translations.json`
+- Environment variables prefixed with `VITE_` for client-side access
+
+### Common Patterns
+- Error handling: Try/catch in async functions, display user-friendly messages
+- Loading states: Use React state for API call status
+- Form validation: Client-side with required fields, server-side in DRF serializers
+- Authentication: Check JWT token presence, redirect to login on 401
+- Permissions: Role-based access (1=admin, 2-5=user levels)
+
+## Key Files to Reference
+
+### Backend
+- `backend/settings.py`: Environment-based config, database switching
+- `ilotalo/models.py`: Core data models and relationships
+- `ilotalo/views.py`: API endpoints implementation
+- `ilotalo/urls.py`: URL routing patterns
+
+### Frontend
+- `src/api/api.ts`: Centralized API calls
+- `src/App.jsx`: Main routing and navigation
+- `src/context/ContextProvider.jsx`: Global state management
+- `src/components/`: Reusable components (e.g., LoginForm, ReservationsView)
+
+### Configuration
+- `docker-compose-dev.yml`: Development environment (uses `Dockerfile.dev`)
+- `docker-compose-prod.yml`: Production environment (uses `Dockerfile`)
+- `pyproject.toml`: Backend dependencies
+- `frontend/package.json`: Frontend scripts and deps
+
+## Gotchas
+- Database migrations required after model changes: `python manage.py makemigrations`
+- Environment variables loaded via python-dotenv in settings.py
+- CORS enabled for frontend-backend communication
+- Finnish UI text, English code comments
+- Test database isolation using CYPRESS env var
+- Scheduler jobs defined in `scheduler/scheduler.py`
+
+## Production
+
+In openshift
+
+Runs through the Dockerfiles, docker composes are not used in production.
+
+**Production Dockerfile**: `backend/Dockerfile` - Multi-stage build with Gunicorn WSGI server, optimized for production with proper security practices and health checks.

.github/workflows/main.yml

@@ -36,7 +36,7 @@ jobs:
       - name: Install dependencies
         run: |
           cd backend
-          poetry install
+          poetry install --no-root
           cd ../frontend
           npm install
 
@@ -65,31 +65,38 @@ jobs:
           poetry run coverage xml -o coverage.xml
 
       - name: Run frontend tests
+        if: success() || failure()
         working-directory: ./frontend
         run: npm run test
 
-      - name: Create frontend coverage report
-        working-directory: ./frontend
-        run: npx jest --coverage
+      # Cypress tests are disabled for now
+      # - name: Start backend
+      #   run: |
+      #     cd backend
+      #     poetry run python manage.py runserver &
 
-      #Cypress tests require backend to be running
-      - name: Start backend
-        run: |
-          cd backend
-          poetry run python manage.py runserver &
-
-      - name: Run Cypress tests
-        uses: cypress-io/github-action@v3
-        with:
-          working-directory: ./frontend
-          project: ./
-          browser: chrome
-          build: npm run build
-          start: npm run dev
+      # - name: Run Cypress tests
+      #   uses: cypress-io/github-action@v3
+      #   with:
+      #     working-directory: ./frontend
+      #     project: ./
+      #     browser: chrome
+      #     build: npm run build
+      #     start: npm run dev
 
       - name: Upload coverage reports to Codecov
+        if: always()
         uses: codecov/codecov-action@v3
         with:
           files: ./backend/coverage.xml,./frontend/coverage/clover.xml
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+
+      - name: Upload Test Coverage Artifacts
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: coverage-reports
+          path: |
+            backend/coverage.xml
+            frontend/coverage/

.gitignore

@@ -2,6 +2,5 @@ __pycache__
 .coverage
 htmlcov
 .env
-backend/ilotalo/migrations/*
-!backend/ilotalo/migrations/__init__
-siivousvuorot.json
+siivousvuorot.json
+SECURITY_AUDIT.md

README.md

@@ -10,6 +10,10 @@
 
 ## Dokumentaatiot
 
+### Tekniset dokumentit
+- [Roolipohjaisen Pääsynhallinnan Dokumentaatio](docs/ROLE_PERMISSIONS.md) - Käyttäjäroolit ja oikeudet
+
+### Sprint dokumentaatio
 - [Product Backlog](https://github.com/orgs/matlury/projects/1)
 - [Sprint 0 Task Board](https://github.com/orgs/matlury/projects/18)
 - [Sprint 1 Task Board](https://github.com/orgs/matlury/projects/20)
@@ -78,6 +82,10 @@ Testit voi ajaa myös pytestin avulla
 ```bash
 poetry run coverage run --branch -m pytest
 ```
+Testit voi ajaa myös rinnakkain
+```bash
+pytest -n auto
+```
 Tällöin testikattavuusraportin saa tulostettua konsoliin komennolla
 ```
 coverage report

backend/.dockerignore

@@ -1 +1,18 @@
-.env
+.env
+__pycache__/
+*.py[cod]
+*$py.class
+.pytest_cache/
+.coverage
+htmlcov/
+.venv/
+venv/
+ENV/
+.git/
+.github/
+.vscode/
+.idea/
+*.log
+db.sqlite3
+.python-version
+# poetry.lock and pyproject.toml are needed for dependencies

backend/Dockerfile

@@ -1,19 +1,60 @@
+# Stage 1: Builder stage
+FROM python:3.10.13-bullseye AS builder
+
+# Set environment variables
+ENV PYTHONDONTWRITEBYTECODE=1 \
+    PYTHONUNBUFFERED=1 \
+    POETRY_VIRTUALENVS_IN_PROJECT=true
+
+WORKDIR /app
+
+# Install Poetry
+RUN pip install poetry
+
+# Configure Poetry
+RUN poetry config virtualenvs.create false
+
+# Copy dependency files
+COPY pyproject.toml poetry.lock ./
+
+# Install dependencies (without dev dependencies)
+RUN poetry install --without dev --no-root
+
+# Stage 2: Production stage
 FROM python:3.10.13-bullseye
 
-ENV POETRY_VIRTUALENVS_IN_PROJECT=true
+# Create non-root user for OpenShift compatibility
+RUN useradd -m -r appuser && \
+    mkdir /app && \
+    chown -R appuser /app
 
-WORKDIR /backend
+# Copy Python packages from builder stage
+COPY --from=builder /usr/local/lib/python3.10/site-packages/ /usr/local/lib/python3.10/site-packages/
+COPY --from=builder /usr/local/bin/ /usr/local/bin/
 
-COPY . .
+# Set the working directory
+WORKDIR /app
 
-RUN chmod -R 777 *
+# Copy application code with proper ownership
+COPY --chown=appuser:appuser . .
 
-RUN pip install poetry
+# Make entrypoint script executable (before switching user)
+RUN chmod +x /app/entrypoint.sh
 
-RUN poetry config virtualenvs.create false
+# OpenShift Permission Fix:
+# Ensure the directory is owned by the root group for OpenShift random UIDs
+RUN chgrp -R 0 /app && \
+    chmod -R g=u /app
+
+# Set environment variables to optimize Python
+ENV PYTHONDONTWRITEBYTECODE=1 \
+    PYTHONUNBUFFERED=1
 
-RUN poetry install --no-dev
+# Switch to non-root user
+USER appuser
 
+# Expose the application port
 EXPOSE 8000
 
-CMD ["/bin/bash", "-c", "python manage.py makemigrations;python manage.py migrate;python manage.py runserver 0.0.0.0:8000"]
+# Use entrypoint script to run migrations and start gunicorn
+ENTRYPOINT ["/app/entrypoint.sh"]

backend/Dockerfile.dev

@@ -0,0 +1,19 @@
+FROM python:3.10.13-bullseye
+
+ENV POETRY_VIRTUALENVS_IN_PROJECT=true
+
+WORKDIR /backend
+
+COPY . .
+
+RUN chmod -R 777 *
+
+RUN pip install poetry
+
+RUN poetry config virtualenvs.create false
+#  --without dev
+RUN poetry install --no-root
+
+EXPOSE 8000
+
+CMD ["/bin/bash", "-c", "python manage.py makemigrations;python manage.py migrate;python manage.py runserver 0.0.0.0:8000"]