Edit email.html

Develop to master

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!98

.eslintignore

@@ -0,0 +1,6 @@
+members/static/js/lib
+infoscreen/static/js/lib
+webapp/static/js/lib
+static/js/lib
+collected_static
+venv

.eslintrc.json

@@ -0,0 +1,251 @@
+{
+    "env": {
+        "browser": true,
+        "jquery": true
+    },
+    "globals": {
+        "angular": true,
+        "noty": true,
+        "_": true,
+        "moment": true
+    },
+    "extends": "eslint:recommended",
+    "rules": {
+        "no-unused-vars": "warn",
+        "accessor-pairs": "error",
+        "array-bracket-spacing": "off",
+        "array-callback-return": "error",
+        "arrow-body-style": "error",
+        "arrow-parens": "error",
+        "arrow-spacing": "error",
+        "block-scoped-var": "off",
+        "block-spacing": "off",
+        "brace-style": "off",
+        "callback-return": "off",
+        "camelcase": "off",
+        "capitalized-comments": "off",
+        "class-methods-use-this": "error",
+        "comma-dangle": "off",
+        "comma-spacing": "off",
+        "comma-style": "off",
+        "complexity": "off",
+        "computed-property-spacing": "off",
+        "consistent-return": "off",
+        "consistent-this": "off",
+        "curly": "off",
+        "default-case": "off",
+        "dot-location": [
+            "error",
+            "property"
+        ],
+        "dot-notation": "off",
+        "eol-last": "off",
+        "eqeqeq": "off",
+        "func-call-spacing": "error",
+        "func-name-matching": "error",
+        "func-names": "off",
+        "func-style": "off",
+        "generator-star-spacing": "error",
+        "global-require": "off",
+        "guard-for-in": "off",
+        "handle-callback-err": "off",
+        "id-blacklist": "error",
+        "id-length": "off",
+        "id-match": "error",
+        "indent": "off",
+        "init-declarations": "off",
+        "jsx-quotes": "error",
+        "key-spacing": "off",
+        "keyword-spacing": "off",
+        "line-comment-position": "off",
+        "linebreak-style": "off",
+        "lines-around-comment": "off",
+        "lines-around-directive": "off",
+        "max-depth": "off",
+        "max-len": "off",
+        "max-lines": "off",
+        "max-nested-callbacks": "error",
+        "max-params": "off",
+        "max-statements": "off",
+        "max-statements-per-line": "off",
+        "multiline-ternary": "off",
+        "new-parens": "off",
+        "newline-after-var": "off",
+        "newline-before-return": "off",
+        "newline-per-chained-call": "off",
+        "no-alert": "error",
+        "no-array-constructor": "off",
+        "no-await-in-loop": "error",
+        "no-bitwise": "off",
+        "no-caller": "error",
+        "no-catch-shadow": "off",
+        "no-confusing-arrow": "error",
+        "no-constant-condition": [
+            "error",
+            {
+                "checkLoops": false
+            }
+        ],
+        "no-continue": "off",
+        "no-div-regex": "error",
+        "no-duplicate-imports": "error",
+        "no-else-return": "off",
+        "no-empty-function": "off",
+        "no-eq-null": "off",
+        "no-eval": "error",
+        "no-extend-native": "error",
+        "no-extra-bind": "error",
+        "no-extra-label": "error",
+        "no-extra-parens": "off",
+        "no-floating-decimal": "off",
+        "no-implicit-coercion": [
+            "error",
+            {
+                "boolean": false,
+                "number": false,
+                "string": false
+            }
+        ],
+        "no-implicit-globals": "off",
+        "no-implied-eval": "error",
+        "no-inline-comments": "off",
+        "no-inner-declarations": [
+            "error",
+            "functions"
+        ],
+        "no-invalid-this": "off",
+        "no-iterator": "error",
+        "no-label-var": "error",
+        "no-labels": "error",
+        "no-lone-blocks": "error",
+        "no-lonely-if": "off",
+        "no-loop-func": "error",
+        "no-magic-numbers": "off",
+        "no-mixed-operators": "off",
+        "no-mixed-requires": "error",
+        "no-multi-assign": "off",
+        "no-multi-spaces": "off",
+        "no-multi-str": "error",
+        "no-multiple-empty-lines": "off",
+        "no-native-reassign": "off",
+        "no-negated-condition": "off",
+        "no-negated-in-lhs": "error",
+        "no-nested-ternary": "off",
+        "no-new": "error",
+        "no-new-func": "off",
+        "no-new-object": "error",
+        "no-new-require": "error",
+        "no-new-wrappers": "error",
+        "no-octal-escape": "error",
+        "no-param-reassign": "off",
+        "no-path-concat": "error",
+        "no-plusplus": "off",
+        "no-process-env": "error",
+        "no-process-exit": "error",
+        "no-proto": "error",
+        "no-prototype-builtins": "off",
+        "no-restricted-globals": "error",
+        "no-restricted-imports": "error",
+        "no-restricted-modules": "error",
+        "no-restricted-properties": "error",
+        "no-restricted-syntax": "error",
+        "no-return-assign": "off",
+        "no-return-await": "error",
+        "no-script-url": "error",
+        "no-self-compare": "error",
+        "no-sequences": "off",
+        "no-shadow": "off",
+        "no-shadow-restricted-names": "error",
+        "no-spaced-func": "error",
+        "no-sync": "error",
+        "no-tabs": "off",
+        "no-template-curly-in-string": "error",
+        "no-ternary": "off",
+        "no-throw-literal": "off",
+        "no-trailing-spaces": "off",
+        "no-undef-init": "error",
+        "no-undefined": "off",
+        "no-underscore-dangle": "off",
+        "no-unmodified-loop-condition": "error",
+        "no-unneeded-ternary": [
+            "error",
+            {
+                "defaultAssignment": true
+            }
+        ],
+        "no-unused-expressions": "off",
+        "no-use-before-define": "off",
+        "no-useless-call": "off",
+        "no-useless-computed-key": "error",
+        "no-useless-concat": "error",
+        "no-useless-constructor": "error",
+        "no-useless-escape": "off",
+        "no-useless-rename": "error",
+        "no-useless-return": "error",
+        "no-var": "off",
+        "no-void": "off",
+        "no-warning-comments": "off",
+        "no-whitespace-before-property": "error",
+        "no-with": "error",
+        "object-curly-newline": "off",
+        "object-curly-spacing": "off",
+        "object-property-newline": "off",
+        "object-shorthand": "off",
+        "one-var": "off",
+        "one-var-declaration-per-line": "off",
+        "operator-assignment": "off",
+        "operator-linebreak": "off",
+        "padded-blocks": "off",
+        "prefer-arrow-callback": "off",
+        "prefer-const": "error",
+        "prefer-destructuring": [
+            "error",
+            {
+                "array": false,
+                "object": false
+            }
+        ],
+        "prefer-numeric-literals": "error",
+        "prefer-promise-reject-errors": "error",
+        "prefer-reflect": "off",
+        "prefer-rest-params": "off",
+        "prefer-spread": "off",
+        "prefer-template": "off",
+        "quote-props": "off",
+        "quotes": "off",
+        "radix": "off",
+        "require-await": "error",
+        "require-jsdoc": "off",
+        "rest-spread-spacing": "error",
+        "semi": "off",
+        "semi-spacing": "off",
+        "sort-imports": "error",
+        "sort-keys": "off",
+        "sort-vars": "off",
+        "space-before-blocks": "off",
+        "space-before-function-paren": "off",
+        "space-in-parens": "off",
+        "space-infix-ops": "off",
+        "space-unary-ops": [
+            "error",
+            {
+                "nonwords": false,
+                "words": false
+            }
+        ],
+        "spaced-comment": "off",
+        "strict": "off",
+        "symbol-description": "error",
+        "template-curly-spacing": "error",
+        "unicode-bom": [
+            "error",
+            "never"
+        ],
+        "valid-jsdoc": "off",
+        "vars-on-top": "off",
+        "wrap-iife": "off",
+        "wrap-regex": "off",
+        "yield-star-spacing": "error",
+        "yoda": "off"
+    }
+}

.gitignore

@@ -11,5 +11,4 @@ node_modules/
 .idea/
 *.code-workspace
 venv/
-.venv/
+.venv/
-poetry.lock

.gitlab-ci.yml

@@ -1,191 +1,191 @@
 stages:
-  - setup
+    - setup
-  - audit
+    - audit
-  - lint
+    - lint
-  - test
+    - test
-  - publish
+    - publish
-  - deploy
+    - deploy
-  - cleanup
+    - cleanup
 
 install:
-  image: node:22
+    image: node:14
-  stage: setup
+    stage: setup
-  only:
+    only:
-    - pushes
+        - pushes
-  script:
+    script:
-    - npm ci
+        - npm ci
-  artifacts:
+    artifacts:
-    paths:
+        paths:
-      - node_modules
+            - node_modules
-    expire_in: 1 week
+        expire_in: 1 week
 
 audit:
-  image: python:3.12.9
+    image: python:3.9
-  stage: audit
+    stage: audit
-  allow_failure: true
+    only:
-  only:
+        - pushes
-    - pushes
+        - develop  
-  needs: []
+    except:
-  before_script:
+        - master
-    - pip install pip==25.3
+    needs: []
-    - pip install poetry==2.1.1
+    before_script:
-    - poetry config virtualenvs.create false
+        - pip install poetry==1.3.1
-    - poetry install --no-interaction --no-ansi
+        - poetry config virtualenvs.create false
-  script:
+        - poetry install --no-interaction --no-ansi
-    - safety check
+    script:
+        - safety check
 
 test:
-  image: python:3.12.9
+    image: python:3.9
-  stage: test
+    stage: test
-  only:
+    only:
-    - pushes
+        - pushes
-  needs: []
+    needs: []
-  services:
+    services:
-    - postgres:12
+        - postgres:12
-  variables:
+    variables:
-    POSTGRES_DB: ci
+        POSTGRES_DB: ci
-    POSTGRES_USER: postgres
+        POSTGRES_USER: postgres
-    POSTGRES_PASSWORD: postgres
+        POSTGRES_PASSWORD: postgres
-    DATABASE_URL: "postgresql://postgres:postgres@postgres:5432/$POSTGRES_DB"
+        DATABASE_URL: "postgresql://postgres:postgres@postgres:5432/$POSTGRES_DB"
-    DB_HOST: postgres
+        DB_HOST: postgres
-  before_script:
+    before_script:
-    - pip install pip==25.3
+        - pip install poetry==1.3.1
-    - pip install poetry==2.1.1
+        - poetry config virtualenvs.create false
-    - poetry config virtualenvs.create false
+        - poetry install --no-interaction --no-ansi
-    - poetry install --no-interaction --no-ansi
+    script:
-  script:
+        - python manage.py migrate --noinput
-    - python manage.py migrate --noinput
+        - python manage.py createdefaultadmin
-    - python manage.py createdefaultadmin
+        - python manage.py test
-    - python manage.py test
 
 lint:py:
-  image: python:3.12.9
+    image: python:3.9
-  stage: lint
+    stage: lint
-  only:
+    only:
-    - pushes
+        - pushes
-  needs: []
+    needs: []
-  script:
+    script:
-    - pip install black==22.3.0
+        - pip install black==22.3.0
-    - black --check .
+        - black --check .
 
 lint:js:
-  image: node:22
+    image: node:14
-  stage: lint
+    stage: lint
-  only:
+    only:
-    - pushes
+        - pushes
-  needs: ["install"]
+    needs: ["install"]
-  script:
+    script:
-    - npm run lint:js
+        - npm run lint:js
 
 lint:md:
-  image: node:22
+    image: node:14
-  stage: lint
+    stage: lint
-  only:
+    only:
-    - pushes
+        - pushes
-  needs: ["install"]
+    needs: ["install"]
-  script:
+    script:
-    - npm run lint:md
+        - npm run lint:md
 
 publish:
-  image: docker:25-cli
+    image: docker:stable
-  stage: publish
+    stage: publish
-  needs: ["test", "lint:py", "lint:js", "lint:md"]
+    needs: ["test", "lint:py", "lint:js", "lint:md"]
-  services:
+    services:
-    - docker:25-dind
+        - docker:stable-dind
-  only:
+    only:
-    - main
+        - develop
-    - production
+        - master
-  script:
+    script:
-    - docker info
+        - docker info
-    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+        - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-    - docker build . -t "$IMAGE_NAME"
+        - docker build . -t "$IMAGE_NAME"
-    - docker push "$IMAGE_NAME"
+        - docker push "$IMAGE_NAME"
 
 deploy:dev:
-  image: docker:25-cli
+    image: docker:stable
-  stage: deploy
+    stage: deploy
-  only:
+    only:
-    - main
+        - develop
-  environment:
+    environment:
-    name: dev
+        name: dev
-    url: http://api.dev.sahkoinsinoorikilta.fi
+        url: http://api.dev.sahkoinsinoorikilta.fi
-  variables:
+    variables:
-    DOCKER_HOST: $DEV_CI_DOCKER_HOST
+        DOCKER_HOST: $DEV_CI_DOCKER_HOST
-    DOCKER_TLS_VERIFY: 1
+        DOCKER_TLS_VERIFY: 1
-  before_script:
+    before_script:
-    - mkdir -p ~/.docker
+        - mkdir -p ~/.docker
-    - echo "$DEV_TLSCACERT" > ~/.docker/ca.pem
+        - echo "$DEV_TLSCACERT" > ~/.docker/ca.pem
-    - echo "$DEV_TLSCERT" > ~/.docker/cert.pem
+        - echo "$DEV_TLSCERT" > ~/.docker/cert.pem
-    - echo "$DEV_TLSKEY" > ~/.docker/key.pem
+        - echo "$DEV_TLSKEY" > ~/.docker/key.pem
-    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+        - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-  script:
+    script:
-    - docker stack deploy --with-registry-auth -c stack-compose-dev.yml "$SERVICE_NAME"
+        - docker stack deploy --with-registry-auth -c stack-compose-dev.yml "$SERVICE_NAME"
-  after_script:
+    after_script:
-    - docker logout "$CI_REGISTRY"
+        - docker logout "$CI_REGISTRY"
 
 deploy:production:
-  stage: deploy
+    stage: deploy
-  image: docker:25-cli
+    image: docker:stable
-  only:
+    only:
-    - production
+        - master
-  environment:
+    environment:
-    name: production
+        name: production
-    url: https://api.sahkoinsinoorikilta.fi
+        url: https://api.sahkoinsinoorikilta.fi
-  when: manual
+    when: manual
-  variables:
+    variables:
-    DOCKER_HOST: $CI_DOCKER_HOST
+        DOCKER_HOST: $CI_DOCKER_HOST
-    DOCKER_TLS_VERIFY: 1
+        DOCKER_TLS_VERIFY: 1
-  before_script:
+    before_script:
-    - mkdir -p ~/.docker
+        - mkdir -p ~/.docker
-    - echo "$TLSCACERT" > ~/.docker/ca.pem
+        - echo "$TLSCACERT" > ~/.docker/ca.pem
-    - echo "$TLSCERT" > ~/.docker/cert.pem
+        - echo "$TLSCERT" > ~/.docker/cert.pem
-    - echo "$TLSKEY" > ~/.docker/key.pem
+        - echo "$TLSKEY" > ~/.docker/key.pem
-    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+        - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-  script:
+    script:
-    - docker stack deploy --with-registry-auth -c stack-compose.yml "$SERVICE_NAME"
+        - docker stack deploy --with-registry-auth -c stack-compose.yml "$SERVICE_NAME"
-  after_script:
+    after_script:
-    - docker logout "$CI_REGISTRY"
+        - docker logout "$CI_REGISTRY"
 
 docker_prune:dev:
-  image: docker:stable
+    image: docker:stable
-  stage: cleanup
+    stage: cleanup
-  only:
+    only:
-    - schedules
+        - schedules
-  environment:
+    environment:
-    name: dev
+        name: dev
-    url: http://api.dev.sahkoinsinoorikilta.fi
+        url: http://api.dev.sahkoinsinoorikilta.fi
-  variables:
+    variables:
-    DOCKER_HOST: $DEV_CI_DOCKER_HOST
+        DOCKER_HOST: $DEV_CI_DOCKER_HOST
-    DOCKER_TLS_VERIFY: 1
+        DOCKER_TLS_VERIFY: 1
-  before_script:
+    before_script:
-    - mkdir -p ~/.docker
+        - mkdir -p ~/.docker
-    - echo "$DEV_TLSCACERT" > ~/.docker/ca.pem
+        - echo "$DEV_TLSCACERT" > ~/.docker/ca.pem
-    - echo "$DEV_TLSCERT" > ~/.docker/cert.pem
+        - echo "$DEV_TLSCERT" > ~/.docker/cert.pem
-    - echo "$DEV_TLSKEY" > ~/.docker/key.pem
+        - echo "$DEV_TLSKEY" > ~/.docker/key.pem
-    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+        - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-  script:
+    script:
-    - docker system prune
+        - docker system prune
-  after_script:
+    after_script:
-    - docker logout "$CI_REGISTRY"
+        - docker logout "$CI_REGISTRY"
 
 docker_prune:prod:
-  image: docker:stable
+    image: docker:stable
-  stage: cleanup
+    stage: cleanup
-  only:
+    only:
-    - schedules
+        - schedules
-  environment:
+    environment:
-    name: production
+        name: production
-    url: https://api.sahkoinsinoorikilta.fi
+        url: https://api.sahkoinsinoorikilta.fi
-  variables:
+    variables:
-    DOCKER_HOST: $CI_DOCKER_HOST
+        DOCKER_HOST: $CI_DOCKER_HOST
-    DOCKER_TLS_VERIFY: 1
+        DOCKER_TLS_VERIFY: 1
-  before_script:
+    before_script:
-    - mkdir -p ~/.docker
+        - mkdir -p ~/.docker
-    - echo "$TLSCACERT" > ~/.docker/ca.pem
+        - echo "$TLSCACERT" > ~/.docker/ca.pem
-    - echo "$TLSCERT" > ~/.docker/cert.pem
+        - echo "$TLSCERT" > ~/.docker/cert.pem
-    - echo "$TLSKEY" > ~/.docker/key.pem
+        - echo "$TLSKEY" > ~/.docker/key.pem
-    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+        - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-  script:
+    script:
-    - docker system prune
+        - docker system prune
-  after_script:
+    after_script:
-    - docker logout "$CI_REGISTRY"
+        - docker logout "$CI_REGISTRY"

.husky/.gitignore

@@ -0,0 +1 @@
+_

.husky/pre-commit

@@ -1,3 +1,6 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
 PURPLE='\033[0;35m'
 NC='\033[0m' # No Color
 

.husky/pre-push

@@ -1,3 +1,6 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
 PURPLE='\033[0;35m'
 NC='\033[0m' # No Color
 

.nvmrc

@@ -1 +0,0 @@
-22.13.1

.python-version

@@ -1 +1 @@
-3.12.9
+3.9

.tool-versions

@@ -1,2 +0,0 @@
-python 3.12.9
-poetry 2.1.1

Dockerfile

@@ -1,13 +1,13 @@
-FROM python:3.12.9-slim-bullseye AS builder
+FROM python:3.9-slim-buster as builder
 ENV PYTHONUNBUFFERED 1
 COPY . ./
-ENV POETRY_VERSION=2.1.1
-RUN pip install pip==25.3
-RUN pip install "poetry==$POETRY_VERSION"
-RUN poetry self add poetry-plugin-export
-RUN poetry export --without-hashes --format=requirements.txt --output requirements.txt
 
-FROM python:3.12.9-slim-bullseye AS server
+ENV POETRY_VERSION=1.3.1
+
+RUN pip install "poetry==$POETRY_VERSION"
+RUN poetry export --without-hashes > requirements.txt
+
+FROM python:3.9-slim-buster as server
 
 WORKDIR /app
 COPY . ./
@@ -22,7 +22,6 @@ ENV PYTHONUNBUFFERED=1 \
     PIP_DEFAULT_TIMEOUT=100
 
 RUN apt-get update && apt-get install --no-install-recommends -y build-essential
-RUN pip install pip==25.3
 RUN pip install --no-deps -r requirements.txt
 
 RUN python manage.py collectstatic --noinput

README.md

@@ -2,12 +2,11 @@
 
 [Django](https://www.djangoproject.com/) backend containing multiple small applications and api for Next.js frontend.
 
-* **Web app:** Backend for the main website.
+*   **Web app:** Backend for the main website.
-* **Member register:** Data table app for viewing and modifying the member register, member applications and membership payments.
+*   **Member register:** Data table app for viewing and modifying the member register, member applications and membership payments.
-* **Kaehmy:** Form for creating and listing kaehmys
+*   **Kaehmy:** Form for creating and listing kaehmys
-* **Ohlhafv:** Form for creating and listing ohlhafv challenges.
+*   **Ohlhafv:** Form for creating and listing ohlhafv challenges.
-* **Infoscreen:** Angular-based slideshow app for the guild room's screens.
+*   **Infoscreen:** Angular-based slideshow app for the guild room's screens.
-
 ## Installation
 
 Set up your SSH key authentication in GitLab Profile Settings. Then clone the repository and checkout the development branch:
@@ -15,13 +14,13 @@ Set up your SSH key authentication in GitLab Profile Settings. Then clone the re
 ```bash
 git clone git@gitlab.com:sahkoinsinoorikilta/vtmk/web2.0-backend.git
 cd web2.0-backend
+git checkout develop
 ```
 
 Copy env file for local use:
-
 ```bash
 cp .env.dev .env
-```
+``` 
 
 ### Poetry
 
@@ -30,69 +29,48 @@ For depedencies and virtual environment, we use [poetry](https://python-poetry.o
 First install [python](https://wiki.python.org/moin/BeginnersGuide/Download). Then install poetry:
 
 ```bash
-python -m pip install poetry==2.1.1
+python3 -m pip install poetry==1.3.1
 ```
 
-Install dependencies with
+The easiest integration with VSCode is to have poetry install virtual environment in project folder, configured with CMD
 
 ```bash
-poetry install
+python3 -m poetry config virtualenvs.in-project true
-```
-
-Poetry is configured to install dependencies in a virtual environment, so you should see `.venv` folder in repo root.
-
-Activate virtual environment in shell
-
-```bash
-eval $(poetry env activate)
 ```
 
 ### Node
 
-We use Node.js for few development tasks, like linting.
+We use Node.js for few development tasks, like linting. Easiest way to install Node is [nvm](https://github.com/nvm-sh/nvm). After installing install dependencies:
-Easiest way to install Node is [nvm](https://github.com/nvm-sh/nvm).
-After installing install dependencies:
 
-```bash
+```
 npm install
 ```
 
-See [Linting](#linting) for more info
+TODO: List scripts
 
 ### Database
 
 To run a local development database **[docker](https://docs.docker.com/engine/install/)** is recommended. If you want to additianally use a db management tool **[pgAdmin](https://www.pgadmin.org/download/)** is nice.
 
 After installing docker use the following to create a database:
-
 ```bash
 docker run --name sik.web.db -e POSTGRES_PASSWORD=postgres -p 5432:5432 -d postgres:12
 ```
 
 ## Development
 
-Install dependencies with
+Activate virtual environment in shell
+
+```bash
+python3 -m poetry shell
+```
+
+Install dependencies
 
 ```bash
 poetry install
 ```
 
-and make sure you are using Python from your virutal environment.
-
-Virtual environment can be activated with
-
-```bash
-eval $(poetry env activate)
-```
-
-and you verify correct Python executable with
-
-```bash
-which python
-
-# should return path similar to {your-system path}/web2.0-backend/.venv/bin/python
-```
-
 ### Initializing data
 
 Run the following `manage.py` commands to initialize a new database. Do not run these in production without thinking!
@@ -128,11 +106,11 @@ Example of creating a feature branch:
 git checkout -b feature-branch-name
 ```
 
-When your changes are ready and the code works without errors, submit a merge request to `main` in GitLab.  Another developer reviews your changes and runs the merge. Feature branches should be closed on merge.
+When your changes are ready and the code works without errors, submit a merge request to `develop` in GitLab.  Another developer reviews your changes and runs the merge. Feature branches should be closed on merge.
 
-Bugfixes do not need their own feature branches and can be pushed straight to `main`, but if the fix needs a notable amount of work, it should be done in a `bugfix` branch instead.
+Bugfixes do not need their own feature branches and can be pushed straight to `develop`, but if the fix needs a notable amount of work, it should be done in a `bugfix` branch instead.
 
-Merge requests to `main` should be reviewed by multiple developers. Only a moderator can accept merge requests to `production`.
+Merge requests to `master` should be reviewed by multiple developers. Only a moderator can accept merge requests to `master`.
 
 ### Linting
 
@@ -172,4 +150,4 @@ For more information about deployment check **[infra](https://gitlab.com/sahkoin
 
 ## GitLab CI
 
-All pushed changes go through the GitLab Continuous Integration, which consists of automated unit testing and linting. Make sure your changes pass both before merging to `main` or `production`.
+All pushed changes go through the GitLab Continuous Integration, which consists of automated unit testing and linting. Make sure your changes pass both before merging to `develop` or `master`.

docker-compose.yml

@@ -1,30 +1,22 @@
+version: '3'
+
 services:
   db:
     image: postgres:12
     volumes:
       - dbdata:/var/lib/postgresql/data
     ports:
-      - 5432:5432
+      - "5432:5432"
     environment:
       - POSTGRES_PASSWORD=postgres
 
   web:
     build: .
-    environment:
+    image: registry.gitlab.com/sahkoinsinoorikilta/vtmk/web2.0-backend
-      - DEPLOY_ENV=local
+    env_file:
-      - HOST=localhost
+      - .env
-      - DEBUG=True
-      - SECRET_KEY=7p$85^4ibb^p4-=vs44b7!y0e-zemugze18@a#30&71=a8)dp(
-      - DB_NAME=postgres
-      - DB_USER=postgres
-      - DB_PASSWD=postgres
-      - DB_HOST=db
-      - DB_PORT=5432
-      - EMAIL_API_KEY=
-      - GROUP_KEY=
-      - GOOGLE_CREDS='{}'
     ports:
-      - 8000:8000
+      - "8000:8000"
     depends_on:
       - db
 

eslint.config.mjs

@@ -1,23 +0,0 @@
-import globals from "globals";
-import js from "@eslint/js";
-
-
-export default [
-  {
-    ignores: ["**/.venv/", "**/collected_static/", "**/static/js/lib/**"],
-  },
-  {
-    languageOptions: {
-      globals: {
-        ...globals.browser,
-        ...globals.jquery,
-        angular: true,
-        moment: true,
-        _: true
-      },
-    },
-  },
-  {
-    ...js.configs.recommended
-  }
-];

kaehmy/migrations/0012_alter_baserole_category_and_more.py

@@ -1,65 +0,0 @@
-# Generated by Django 4.2.24 on 2025-10-13 14:48
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("kaehmy", "0011_delete_kaehmybaserole"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="baserole",
-            name="category",
-            field=models.CharField(
-                choices=[
-                    ("board", "Board"),
-                    ("corporate", "Corporate affairs"),
-                    ("freshman", "Freshmen"),
-                    ("international", "International"),
-                    ("siwa", "SIK's free time"),
-                    ("media", "Media"),
-                    ("tech", "Technology"),
-                    ("wellbeing", "Wellbeing"),
-                    ("sikpaja", "Sik-paja"),
-                    ("ceremonies", "Ceremonies"),
-                    ("studies", "Studies"),
-                    ("sosso", "Sössö magazine"),
-                    ("pota", "PoTa"),
-                    ("alumni", "Alumni relations"),
-                    ("n", "N"),
-                    ("others", "Others"),
-                ],
-                default="others",
-                max_length=255,
-                verbose_name="Category",
-            ),
-        ),
-        migrations.AlterField(
-            model_name="customrole",
-            name="baserole_ptr",
-            field=models.OneToOneField(
-                auto_created=True,
-                on_delete=django.db.models.deletion.CASCADE,
-                parent_link=True,
-                primary_key=True,
-                serialize=False,
-                to="kaehmy.baserole",
-            ),
-        ),
-        migrations.AlterField(
-            model_name="presetrole",
-            name="baserole_ptr",
-            field=models.OneToOneField(
-                auto_created=True,
-                on_delete=django.db.models.deletion.CASCADE,
-                parent_link=True,
-                primary_key=True,
-                serialize=False,
-                to="kaehmy.baserole",
-            ),
-        ),
-    ]

members/admin.py

@@ -3,13 +3,8 @@
 from django.contrib import admin
 from members.models import Member, Request, Payment
 
-
 # Register your models here.
-class MemberAdmin(admin.ModelAdmin):
+admin.site.register(Member)
-    search_fields = ("first_name", "last_name", "email", "POR")
-
-
-admin.site.register(Member, MemberAdmin)
 admin.site.register(Request)
 admin.site.register(Payment)
 

package.json

@@ -9,7 +9,7 @@
     "lint:py": "black --diff --check .",
     "lint:py:fix": "black .",
     "lint:py-type": "pyright",
-    "prepare": "husky"
+    "prepare": "husky install"
   },
   "repository": {
     "type": "git",
@@ -17,15 +17,13 @@
   },
   "author": "SIK ry",
   "license": "ISC",
-  "devDependencies": {
+  "dependencies": {
-    "@eslint/js": "^9.20.0",
+    "eslint": "^7.28.0",
-    "eslint": "^9.20.0",
+    "husky": "^6.0.0",
-    "globals": "^15.14.0",
-    "husky": "^9.1.7",
     "npm-run-all": "^4.1.5",
-    "pyright": "^1.1.393",
+    "pyright": "^1.1.149",
-    "remark-cli": "^12.0.1",
+    "remark-cli": "^9.0.0",
-    "remark-preset-lint-recommended": "^7.0.1"
+    "remark-preset-lint-recommended": "^5.0.0"
   },
   "remarkConfig": {
     "plugins": [

pyproject.toml

@@ -1,65 +1,50 @@
-[project]
+[tool.poetry]
-authors = [
-  {name = "Aarni Halinen", email = "aarni.halinen@sahkoinsinoorikilta.fi"},
-]
-description = "Backend for sahkoinsinoorikilta.fi"
 name = "web2.0-backend"
-readme = "README.md"
-requires-python = "~3.12"
 version = "0.1.0"
-
+description = "Backend for sahkoinsinoorikilta.fi"
-[virtualenvs]
+authors = ["Aarni Halinen aarni.halinen@sahkoinsinoorikilta.fi"]
-create = true
-in-project = true
 
 [tool.poetry.dependencies]
-decorator = "^4.4.2"
+python = "^3.9"
-Django = "^4.2.19"
+decorator = "^4.0.9"
-django-app-namespace-template-loader = "^0.4.1"
+Django = "^4.1"
-django-auditlog = "^2.1.1"
+requests = "^2.28.1"
-django-autocomplete-light = "^3.4.1"
-django-bootstrap3 = "^21.2.0"
 django-cors-headers = "^3.13.0"
-django-filter = "^22.1.0"
-django-import-export = "^2.8.0"
-django-modeltranslation = "^0.18.4"
-django-phonenumber-field = {version = "^6.4.0", extras = ["phonenumbers"]}
-django-polymorphic = "^3.1.0"
-django-tables2 = "^2.4.1"
 djangorestframework = "^3.12.4"
-djangorestframework-simplejwt = "^5.5.0"
+psycopg2-binary = "^2.9.3"
-google-auth = "^2.9.1"
+django-bootstrap3 = "^21.2"
-google-api-python-client = "^2.54.0"
+django-tables2 = "^2.4.1"
-gunicorn = "^23.0.0"
+django-modeltranslation = "^0.18.4"
+django-auditlog = "^2.1.1"
+django-phonenumber-field = {version = "^6.3.0", extras = ["phonenumbers"]}
+django-autocomplete-light = "^3.4.1"
+six = "^1.12.0"
+pyexcel = "^0.7.0"
+pyexcel-xlsx = "^0.6.0"
+django-import-export = "^2.8.0"
+openpyxl = "^2.6.4"
+django-app-namespace-template-loader = "^0.4.1"
+django-filter = "^22.1"
+whitenoise = "^6.2.0"
 jsonschema = "^4.9.0"
 Markdown = "^3.2.2"
-openpyxl = "^2.6.4"
+uWSGI = "^2.0.18"
-Pillow = "^10.0.0"
+gunicorn = "^20.1.0"
-psycopg2-binary = "^2.9.3"
+Pillow = "^9.1.1"
-pyexcel = "^0.7.0"
-pyexcel-io = "^0.6.0"
-pyexcel-xlsx = "^0.6.0"
-python-dotenv = "^0.20.0"
-requests = "^2.28.1"
 sendgrid = "^6.7.0"
-sentry-sdk = "^2.24.1"
+sentry-sdk = "^1.4.3"
-six = "^1.12.0"
+django-polymorphic = "^3.1.0"
-uWSGI = "^2.0.28"
+python-dotenv = "^0.20.0"
-whitenoise = "^6.2.0"
+djangorestframework-simplejwt = "^5.2.0"
-pyjwt = "^2.9.0"
+google-auth = "^2.9.1"
-setuptools = "^80.9.0"
+google-api-python-client = "^2.54.0"
+pyexcel-io = "^0.6.6"
 
-[tool.poetry.group.dev.dependencies]
+[tool.poetry.dev-dependencies]
-black = "^25.1.0"
 coverage = "^6.4.2"
-safety = "^2.3.4"
+safety = "^2.1.1"
-
+black = "^22.6.0"
-[tool.poetry]
-package-mode = false
-
-[tool.poetry.requires-plugins]
-poetry-plugin-export = "^1.9"
 
 [build-system]
-requires = ["poetry-core>=2.0.0,<3.0.0"]
+requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"

pyright.json

@@ -12,5 +12,5 @@
   "reportMissingImports": true,
   "reportMissingTypeStubs": false,
 
-  "pythonVersion": "3.12.9"
+  "pythonVersion": "3.9"
 }

templates/kaehmy/header.html

@@ -8,7 +8,7 @@
     </div>
     <div class="kaehmy-banner heading">
         <p style="color:#D57A2D; font-size:2rem">{% blocktrans %}Kähmyt ovat auki!{% endblocktrans %}</p>
-        <p style="color:#BFDBD9; font-size:1rem">{% blocktrans %}Haku hallitukseen 20.10. mennessä ja toimihenkilöksi 13.11. mennessä.{% endblocktrans %}</p>
+        <p style="color:#BFDBD9; font-size:1rem">{% blocktrans %}Haku hallitukseen 23.10. mennessä ja toimihenkilöksi 15.11 mennessä.{% endblocktrans %}</p>
         <p style="color:#BFDBD9; font-size:1.5rem">{% blocktrans %}Hae nyt!{% endblocktrans %}</p>
     </div>
 </div>

templates/kaehmy/kaehmy.html

@@ -28,12 +28,12 @@
         </p>
         <h5>{% trans "Päivämääriä & deadlineja" %}</h5>
         <ul>
-            <li><strong>20.10.</strong> {% blocktrans %}Toimikuntablää$t {% endblocktrans %}</li>
+            <li><strong>11.10.</strong> {% blocktrans %}Toimikuntablää$t @Kiltis{% endblocktrans %}</li>
-            <li><strong>20.10.</strong> {% blocktrans %}Deadline hallitusvirkoihin hakemiselle.{% endblocktrans %}</li>
+            <li><strong>23.10.</strong> {% blocktrans %}Deadline hallitusvirkoihin hakemiselle.{% endblocktrans %}</li>
-            <li><strong>21.10.</strong> {% blocktrans %}Vaalikokous, osa 1 (puheenjohtajan ja yleisen kokouksen puheenjohtajan valinta) ja hallitustyrkkypaneeli{% endblocktrans %}</li>
+            <li><strong>24.10.</strong> {% blocktrans %}Vaalikokous, osa 1 (puheenjohtajan valinta) ja hallitustyrkkypaneeli{% endblocktrans %}</li>
             <li><strong>6.11.</strong> {% blocktrans %}Vaalikokous, osa 2 (hallituksen ja toimikuntien puheenjohtajien valinta){% endblocktrans %}</li>
-            <li><strong>13.11.</strong> {% blocktrans %}Deadline toimivirkoihin hakemiselle.{% endblocktrans %}</li>
+            <li><strong>15.11.</strong> {% blocktrans %}Deadline toimivirkoihin hakemiselle.{% endblocktrans %}</li>
-            <li><strong>19.11.</strong> {% blocktrans %}Vaalikokous, osa 3 (toimarien valinta){% endblocktrans %}</li>
+            <li><strong>21.11.</strong> {% blocktrans %}Vaalikokous, osa 3 (toimarien valinta){% endblocktrans %}</li>
         </ul>
         <form name="kaehmyForm" action="/kaehmy/submit/" method="post" class="form">{% csrf_token %}
             {% bootstrap_field form.name %}
@@ -77,7 +77,7 @@
 
             <input type="checkbox" required name="gdpr" value="1">
             <span>{% blocktrans %}
-                Hyväksyn <a href="https://static.sahkoinsinoorikilta.fi/GDPR/Suomeksi/Tietosuojaseloste%20–%20Toimihenkilöksi%20hakemisen%20rekisteri.pdf" target="_blank">tietosuojaselosteen</a> ja tietojeni tallentamisen.
+                Hyväksyn <a href="https://static.sahkoinsinoorikilta.fi/GDPR/Tietosuojaseloste%20%E2%80%93%20Toimihenkil%C3%B6ksi%20hakemisen%20rekisteri.pdf" target="_blank">tietosuojaselosteen</a> ja tietojeni tallentamisen.
                 {% endblocktrans %}
             </span>
             <br>

templates/members/email_application_accept.html

@@ -10,4 +10,4 @@
 </p>
 
 <p>Liity myös killan TG-kanavalle:</p>
-<p><a href="https://t.me/+PZgBP-GplGNkZTRk">Killan yleinen telegram</a></p>
+<p><a href="https://t.me/+AB-JMbAxM2c0MDc0">Killan yleinen telegram</a></p>

templates/ohlhafv/email.html

@@ -5,6 +5,6 @@
 
 {{ challenge.message }}
 
-{% trans "Muistattehan vahvistaa haasteen paikan päällä Smökissä torstaina 12.2" %}.
+{% trans "Muistattehan vahvistaa haasteen paikan päällä Smökissä torstaina 13.2" %}.
 
-{% trans "Käy kurkkaamassa muutkin haasteet osoitteessa" %} {{ url }}
+{% trans "Käy kurkkaamassa muutkin haasteet osoitteessa" %} {{ url }}

webapp/migrations/0083_signup_submit_id_alter_basewebhook_polymorphic_ctype.py

@@ -1,32 +0,0 @@
-# Generated by Django 4.2.24 on 2025-10-13 14:48
-
-from django.db import migrations, models
-import django.db.models.deletion
-import uuid
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("contenttypes", "0002_remove_content_type_name"),
-        ("webapp", "0082_delete_baserole"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="signup",
-            name="submit_id",
-            field=models.UUIDField(default=uuid.uuid4, editable=False, null=True),
-        ),
-        migrations.AlterField(
-            model_name="basewebhook",
-            name="polymorphic_ctype",
-            field=models.ForeignKey(
-                editable=False,
-                null=True,
-                on_delete=django.db.models.deletion.CASCADE,
-                related_name="polymorphic_%(app_label)s.%(class)s_set+",
-                to="contenttypes.contenttype",
-            ),
-        ),
-    ]

webapp/migrations/0084_alter_signup_submit_id.py

@@ -1,18 +0,0 @@
-# Generated by Django 4.2.24 on 2025-10-13 15:19
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("webapp", "0083_signup_submit_id_alter_basewebhook_polymorphic_ctype"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="signup",
-            name="submit_id",
-            field=models.UUIDField(null=True),
-        ),
-    ]

webapp/migrations/0085_alter_signup_submit_id.py

@@ -1,18 +0,0 @@
-# Generated by Django 4.2.24 on 2025-10-13 15:46
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("webapp", "0084_alter_signup_submit_id"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="signup",
-            name="submit_id",
-            field=models.CharField(null=True),
-        ),
-    ]

webapp/migrations/0086_alter_signup_submit_id.py

@@ -1,18 +0,0 @@
-# Generated by Django 4.2.24 on 2025-10-13 15:51
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("webapp", "0085_alter_signup_submit_id"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="signup",
-            name="submit_id",
-            field=models.UUIDField(editable=False, null=True),
-        ),
-    ]

webapp/migrations/0087_alter_signup_submit_id.py

@@ -1,18 +0,0 @@
-# Generated by Django 4.2.24 on 2025-10-13 15:53
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("webapp", "0086_alter_signup_submit_id"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="signup",
-            name="submit_id",
-            field=models.UUIDField(editable=False, null=True, unique=True),
-        ),
-    ]

webapp/models.py

@@ -195,8 +195,6 @@ class Signup(models.Model):
     email = models.EmailField(blank=True, null=True)
     # Random unique identifier. Used for signup editing by the user.
     uuid = models.UUIDField(default=uuid4, editable=False)
-    # Random unique identifier generated by browser upon opening signup form. Used to prevent duplicate signups.
-    submit_id = models.UUIDField(null=True, editable=False, unique=True)
     deleted = models.BooleanField(default=False)
 
     def __str__(self):

webapp/serializers.py

@@ -7,7 +7,6 @@ class SignupSerializer(serializers.ModelSerializer):
         source="signupForm", queryset=SignupForm.objects.all()
     )
     list_name = serializers.CharField(read_only=True)
-    submit_id = serializers.UUIDField(required=False)
 
     def add_extra_fields(self, validated_data):
         questions = validated_data["signupForm"].questions
@@ -35,7 +34,7 @@ class SignupSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Signup
-        fields = ("id", "submit_id", "signupForm_id", "answer", "list_name")
+        fields = ("id", "signupForm_id", "answer", "list_name")
         extra_kwargs = {
             "url": {
                 "view_name": "signup-detail",

webapp/views.py

@@ -1,7 +1,6 @@
 """Webapp views."""
 
 import json
-import time
 from jwt import decode
 from jwt.exceptions import InvalidTokenError
 from django.utils import timezone
@@ -12,7 +11,6 @@ from django.views.decorators.http import require_http_methods
 from django_filters import rest_framework as filters
 from django.db.models import Prefetch
 from django.core.exceptions import ObjectDoesNotExist
-from django.db.utils import IntegrityError
 from rest_framework import routers
 from rest_framework.response import Response
 from rest_framework.viewsets import ModelViewSet, ReadOnlyModelViewSet
@@ -214,14 +212,6 @@ class SignupViewSet(ModelViewSet):
             return self.partial_update(request, *args, **kwargs)
 
     def create(self, request, *args, **kwargs):
-        # Temporary manual duplicate check as submit_id uniqueness is not enforced in deployment database
-        if "submit_id" in request.data and Signup.objects.filter(
-            submit_id=request.data["submit_id"]
-        ):
-            return JsonResponse(
-                status=200, data={"message": "The submission has already been received"}
-            )
-
         id = request.data["signupForm_id"]
         try:
             answer = request.data["answer"]
@@ -236,10 +226,6 @@ class SignupViewSet(ModelViewSet):
             return JsonResponse(
                 status=404, data={"error": f"SignupForm {id} not found"}
             )
-        except IntegrityError:
-            return JsonResponse(
-                status=200, data={"message": "The submission has already been received"}
-            )
         else:
             return JsonResponse(
                 status=404, data={"error": f"SignupForm {id} not found"}