Update dependency pre-commit to v2.21.0

2024-08-23 13:35:45 +00:00
20 changed files with 81 additions and 297 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -15,7 +15,7 @@ trigger:

 steps:
  - name: install-lint-test
-    image: python:3.8.19-alpine@sha256:3bd7ea88cb637e09d6c7de24c5394657163a85c2be82bfebe0305cf07f8de1ea
+    image: python:3.11.9-alpine@sha256:700b4aa84090748aafb348fc042b5970abb0a73c8f1b4fcfe0f4e3c2a4a9fcca
    env:
      PYROOT: '/pyroot'
      PYTHONUSERBASE: '/pyroot'
@ -93,7 +93,7 @@ trigger:

 steps:
  - name: install-lint-test
-    image: python:3.8.19-alpine@sha256:3bd7ea88cb637e09d6c7de24c5394657163a85c2be82bfebe0305cf07f8de1ea
+    image: python:3.11.9-alpine@sha256:700b4aa84090748aafb348fc042b5970abb0a73c8f1b4fcfe0f4e3c2a4a9fcca
    env:
      PYROOT: '/pyroot'
      PYTHONUSERBASE: '/pyroot'
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@ -27,5 +27,5 @@ repos:
      name: reuse
      entry: reuse lint
      language: system
-      exclude: ^(venv).*$
+      exclude: .*
      always_run: true
--- a/.python-version
+++ b/.python-version
@ -1 +0,0 @@
-3.8.19
--- a/.reuse/dep5
+++ b/.reuse/dep5
@ -11,6 +11,6 @@ Files: Pipfile.lock migrations/*
 Copyright: WTF Kooperative eG <https://wtf-eg.de/>
 License: AGPL-3.0-or-later

-Files: renovate.json .python-version
+Files: renovate.json
 Copyright: WTF Kooperative eG <https://wtf-eg.de/>
 License: AGPL-3.0-or-later
--- a/.yapfignore
+++ b/.yapfignore
@ -1,5 +0,0 @@
-# SPDX-FileCopyrightText: WTF Kooperative eG <https://wtf-eg.de/>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
-migrations/*.py
--- a/4
+++ b/4
@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later

-FROM python:3.8.19-alpine@sha256:3bd7ea88cb637e09d6c7de24c5394657163a85c2be82bfebe0305cf07f8de1ea AS builder
+FROM python:3.11.9-alpine@sha256:700b4aa84090748aafb348fc042b5970abb0a73c8f1b4fcfe0f4e3c2a4a9fcca AS builder

 ENV PYROOT=/pyroot
 ENV PYTHONUSERBASE=$PYROOT
@ -20,7 +20,7 @@ RUN PIP_USER=1 PIP_IGNORE_INSTALLED=1 pipenv install --system --deploy --ignore-
 RUN pip3 uninstall --yes pipenv


-FROM python:3.8.19-alpine@sha256:3bd7ea88cb637e09d6c7de24c5394657163a85c2be82bfebe0305cf07f8de1ea AS ki-backend
+FROM python:3.11.9-alpine@sha256:700b4aa84090748aafb348fc042b5970abb0a73c8f1b4fcfe0f4e3c2a4a9fcca AS ki-backend

 ENV PYROOT=/pyroot
 ENV PYTHONUSERBASE=$PYROOT
--- a/14
+++ b/14
@ -8,8 +8,8 @@ verify_ssl = true
 name = "pypi"

 [packages]
-flask = "==2.3.3"
-python-dotenv = "==0.21.1"
+flask = "==2.0.3"
+python-dotenv = "==0.17.1"
 flask-migrate = "==3.0.1"
 flask-sqlalchemy  = "==2.5.1"
 sqlalchemy = "==1.4.53"
@ -17,17 +17,17 @@ waitress = "==2.1.2"
 pyyaml = "==6.0.2"
 flask-cors = "==3.0.10"
 ldap3 = "==2.9.1"
-pymysql = "==1.1.1"
+pymysql = "==1.0.3"
 werkzeug = "==2.3.8"

 [dev-packages]
-flake8 = "==6.1.0"
-yapf = "==0.40.2"
-pre-commit = "==2.13.0"
+flake8 = "==3.9.2"
+yapf = "==0.31.0"
+pre-commit = "==2.21.0"
 reuse = "==0.14.0"

 [requires]
-python_version = "3.8"
+python_version = "3.11"

 [scripts]
 clean = "rm data/ki.sqlite"
--- a/Pipfile.lock
+++ b/Pipfile.lock
@ -1,11 +1,11 @@
 {
    "_meta": {
        "hash": {
-            "sha256": "701ece99277177da8e5adf857508e3b83e00e1f75bd20509b370bbe0bd8c008f"
+            "sha256": "449eddc1f51af4eaf66443277e81ba5402260db3fa906c99015c08c8fabbd0b9"
        },
        "pipfile-spec": 6,
        "requires": {
-            "python_version": "3.8"
+            "python_version": "3.11"
        },
        "sources": [
            {
@ -24,14 +24,6 @@
            "markers": "python_version >= '3.8'",
            "version": "==1.13.2"
        },
-        "blinker": {
-            "hashes": [
-                "sha256:1779309f71bf239144b9399d06ae925637cf6634cf6bd131104184531bf67c01",
-                "sha256:8f77b09d3bf7c795e969e9486f39c2c5e9c39d4ee07424be2bc594ece9642d83"
-            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==1.8.2"
-        },
        "click": {
            "hashes": [
                "sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28",
@ -42,12 +34,12 @@
        },
        "flask": {
            "hashes": [
-                "sha256:09c347a92aa7ff4a8e7f3206795f30d826654baf38b873d0744cd571ca609efc",
-                "sha256:f69fcd559dc907ed196ab9df0e48471709175e696d6e698dd4dbe940f96ce66b"
+                "sha256:59da8a3170004800a2837844bfa84d49b022550616070f7cb1a659682b2e7c9f",
+                "sha256:e1120c228ca2f553b470df4a5fa927ab66258467526069981b3eb0a91902687d"
            ],
            "index": "pypi",
-            "markers": "python_version >= '3.8'",
-            "version": "==2.3.3"
+            "markers": "python_version >= '3.6'",
+            "version": "==2.0.3"
        },
        "flask-cors": {
            "hashes": [
@ -74,76 +66,12 @@
            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
            "version": "==2.5.1"
        },
-        "greenlet": {
-            "hashes": [
-                "sha256:01bc7ea167cf943b4c802068e178bbf70ae2e8c080467070d01bfa02f337ee67",
-                "sha256:0448abc479fab28b00cb472d278828b3ccca164531daab4e970a0458786055d6",
-                "sha256:086152f8fbc5955df88382e8a75984e2bb1c892ad2e3c80a2508954e52295257",
-                "sha256:098d86f528c855ead3479afe84b49242e174ed262456c342d70fc7f972bc13c4",
-                "sha256:149e94a2dd82d19838fe4b2259f1b6b9957d5ba1b25640d2380bea9c5df37676",
-                "sha256:1551a8195c0d4a68fac7a4325efac0d541b48def35feb49d803674ac32582f61",
-                "sha256:15d79dd26056573940fcb8c7413d84118086f2ec1a8acdfa854631084393efcc",
-                "sha256:1996cb9306c8595335bb157d133daf5cf9f693ef413e7673cb07e3e5871379ca",
-                "sha256:1a7191e42732df52cb5f39d3527217e7ab73cae2cb3694d241e18f53d84ea9a7",
-                "sha256:1ea188d4f49089fc6fb283845ab18a2518d279c7cd9da1065d7a84e991748728",
-                "sha256:1f672519db1796ca0d8753f9e78ec02355e862d0998193038c7073045899f305",
-                "sha256:2516a9957eed41dd8f1ec0c604f1cdc86758b587d964668b5b196a9db5bfcde6",
-                "sha256:2797aa5aedac23af156bbb5a6aa2cd3427ada2972c828244eb7d1b9255846379",
-                "sha256:2dd6e660effd852586b6a8478a1d244b8dc90ab5b1321751d2ea15deb49ed414",
-                "sha256:3ddc0f794e6ad661e321caa8d2f0a55ce01213c74722587256fb6566049a8b04",
-                "sha256:3ed7fb269f15dc662787f4119ec300ad0702fa1b19d2135a37c2c4de6fadfd4a",
-                "sha256:419b386f84949bf0e7c73e6032e3457b82a787c1ab4a0e43732898a761cc9dbf",
-                "sha256:43374442353259554ce33599da8b692d5aa96f8976d567d4badf263371fbe491",
-                "sha256:52f59dd9c96ad2fc0d5724107444f76eb20aaccb675bf825df6435acb7703559",
-                "sha256:57e8974f23e47dac22b83436bdcf23080ade568ce77df33159e019d161ce1d1e",
-                "sha256:5b51e85cb5ceda94e79d019ed36b35386e8c37d22f07d6a751cb659b180d5274",
-                "sha256:649dde7de1a5eceb258f9cb00bdf50e978c9db1b996964cd80703614c86495eb",
-                "sha256:64d7675ad83578e3fc149b617a444fab8efdafc9385471f868eb5ff83e446b8b",
-                "sha256:68834da854554926fbedd38c76e60c4a2e3198c6fbed520b106a8986445caaf9",
-                "sha256:6b66c9c1e7ccabad3a7d037b2bcb740122a7b17a53734b7d72a344ce39882a1b",
-                "sha256:70fb482fdf2c707765ab5f0b6655e9cfcf3780d8d87355a063547b41177599be",
-                "sha256:7170375bcc99f1a2fbd9c306f5be8764eaf3ac6b5cb968862cad4c7057756506",
-                "sha256:73a411ef564e0e097dbe7e866bb2dda0f027e072b04da387282b02c308807405",
-                "sha256:77457465d89b8263bca14759d7c1684df840b6811b2499838cc5b040a8b5b113",
-                "sha256:7f362975f2d179f9e26928c5b517524e89dd48530a0202570d55ad6ca5d8a56f",
-                "sha256:81bb9c6d52e8321f09c3d165b2a78c680506d9af285bfccbad9fb7ad5a5da3e5",
-                "sha256:881b7db1ebff4ba09aaaeae6aa491daeb226c8150fc20e836ad00041bcb11230",
-                "sha256:894393ce10ceac937e56ec00bb71c4c2f8209ad516e96033e4b3b1de270e200d",
-                "sha256:99bf650dc5d69546e076f413a87481ee1d2d09aaaaaca058c9251b6d8c14783f",
-                "sha256:9da2bd29ed9e4f15955dd1595ad7bc9320308a3b766ef7f837e23ad4b4aac31a",
-                "sha256:afaff6cf5200befd5cec055b07d1c0a5a06c040fe5ad148abcd11ba6ab9b114e",
-                "sha256:b1b5667cced97081bf57b8fa1d6bfca67814b0afd38208d52538316e9422fc61",
-                "sha256:b37eef18ea55f2ffd8f00ff8fe7c8d3818abd3e25fb73fae2ca3b672e333a7a6",
-                "sha256:b542be2440edc2d48547b5923c408cbe0fc94afb9f18741faa6ae970dbcb9b6d",
-                "sha256:b7dcbe92cc99f08c8dd11f930de4d99ef756c3591a5377d1d9cd7dd5e896da71",
-                "sha256:b7f009caad047246ed379e1c4dbcb8b020f0a390667ea74d2387be2998f58a22",
-                "sha256:bba5387a6975598857d86de9eac14210a49d554a77eb8261cc68b7d082f78ce2",
-                "sha256:c5e1536de2aad7bf62e27baf79225d0d64360d4168cf2e6becb91baf1ed074f3",
-                "sha256:c5ee858cfe08f34712f548c3c363e807e7186f03ad7a5039ebadb29e8c6be067",
-                "sha256:c9db1c18f0eaad2f804728c67d6c610778456e3e1cc4ab4bbd5eeb8e6053c6fc",
-                "sha256:d353cadd6083fdb056bb46ed07e4340b0869c305c8ca54ef9da3421acbdf6881",
-                "sha256:d46677c85c5ba00a9cb6f7a00b2bfa6f812192d2c9f7d9c4f6a55b60216712f3",
-                "sha256:d4d1ac74f5c0c0524e4a24335350edad7e5f03b9532da7ea4d3c54d527784f2e",
-                "sha256:d73a9fe764d77f87f8ec26a0c85144d6a951a6c438dfe50487df5595c6373eac",
-                "sha256:da70d4d51c8b306bb7a031d5cff6cc25ad253affe89b70352af5f1cb68e74b53",
-                "sha256:daf3cb43b7cf2ba96d614252ce1684c1bccee6b2183a01328c98d36fcd7d5cb0",
-                "sha256:dca1e2f3ca00b84a396bc1bce13dd21f680f035314d2379c4160c98153b2059b",
-                "sha256:dd4f49ae60e10adbc94b45c0b5e6a179acc1736cf7a90160b404076ee283cf83",
-                "sha256:e1f145462f1fa6e4a4ae3c0f782e580ce44d57c8f2c7aae1b6fa88c0b2efdb41",
-                "sha256:e3391d1e16e2a5a1507d83e4a8b100f4ee626e8eca43cf2cadb543de69827c4c",
-                "sha256:fcd2469d6a2cf298f198f0487e0a5b1a47a42ca0fa4dfd1b6862c999f018ebbf",
-                "sha256:fd096eb7ffef17c456cfa587523c5f92321ae02427ff955bebe9e3c63bc9f0da",
-                "sha256:fe754d231288e1e64323cfad462fcee8f0288654c10bdf4f603a39ed923bef33"
-            ],
-            "markers": "python_version >= '3' and platform_machine == 'aarch64' or (platform_machine == 'ppc64le' or (platform_machine == 'x86_64' or (platform_machine == 'amd64' or (platform_machine == 'AMD64' or (platform_machine == 'win32' or platform_machine == 'WIN32')))))",
-            "version": "==3.0.3"
-        },
        "importlib-metadata": {
            "hashes": [
                "sha256:66f342cc6ac9818fc6ff340576acd24d65ba0b3efabb2b4ac08b598965a4a2f1",
                "sha256:9a547d3bc3608b025f93d403fdd1aae741c24fbb8314df4b155675742ce303c5"
            ],
-            "markers": "python_version < '3.10'",
+            "markers": "python_version < '3.9'",
            "version": "==8.4.0"
        },
        "importlib-resources": {
@ -265,21 +193,20 @@
        },
        "pymysql": {
            "hashes": [
-                "sha256:4de15da4c61dc132f4fb9ab763063e693d521a80fd0e87943b9a453dd4c19d6c",
-                "sha256:e127611aaf2b417403c60bf4dc570124aeb4a57f5f37b8e95ae399a42f904cd0"
+                "sha256:3dda943ef3694068a75d69d071755dbecacee1adf9a1fc5b206830d2b67d25e8",
+                "sha256:89fc6ae41c0aeb6e1f7710cdd623702ea2c54d040565767a78b00a5ebb12f4e5"
            ],
            "index": "pypi",
            "markers": "python_version >= '3.7'",
-            "version": "==1.1.1"
+            "version": "==1.0.3"
        },
        "python-dotenv": {
            "hashes": [
-                "sha256:1c93de8f636cde3ce377292818d0e440b6e45a82f215c3744979151fa8151c49",
-                "sha256:41e12e0318bebc859fcc4d97d4db8d20ad21721a6aa5047dd59f090391cb549a"
+                "sha256:00aa34e92d992e9f8383730816359647f358f4a3be1ba45e5a5cefd27ee91544",
+                "sha256:b1ae5e9643d5ed987fc57cc2583021e38db531946518130777734f9589b3141f"
            ],
            "index": "pypi",
-            "markers": "python_version >= '3.7'",
-            "version": "==0.21.1"
+            "version": "==0.17.1"
        },
        "pyyaml": {
            "hashes": [
@ -428,11 +355,11 @@
        },
        "zipp": {
            "hashes": [
-                "sha256:9960cd8967c8f85a56f920d5d507274e74f9ff813a0ab8889a5b5be2daf44064",
-                "sha256:c22b14cc4763c5a5b04134207736c107db42e9d3ef2d9779d465f5f1bcba572b"
+                "sha256:0145e43d89664cfe1a2e533adc75adafed82fe2da404b4bbb6b026c0157bdb31",
+                "sha256:58da6168be89f0be59beb194da1250516fdaa062ccebd30127ac65d30045e10d"
            ],
            "markers": "python_version >= '3.8'",
-            "version": "==3.20.1"
+            "version": "==3.20.0"
        }
    },
    "develop": {
@ -587,12 +514,12 @@
        },
        "flake8": {
            "hashes": [
-                "sha256:d5b3857f07c030bdb5bf41c7f53799571d75c4491748a3adcd47de929e34cd23",
-                "sha256:ffdfce58ea94c6580c77888a86506937f9a1a227dfcd15f245d694ae20a6b6e5"
+                "sha256:07528381786f2a6237b061f6e96610a4167b226cb926e2aa2b6b1d78057c576b",
+                "sha256:bf8fd333346d844f616e8d47905ef3a3384edae6b4e9beb0c5101e25e3110907"
            ],
            "index": "pypi",
-            "markers": "python_full_version >= '3.8.1'",
-            "version": "==6.1.0"
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
+            "version": "==3.9.2"
        },
        "identify": {
            "hashes": [
@ -604,19 +531,11 @@
        },
        "idna": {
            "hashes": [
-                "sha256:050b4e5baadcd44d760cedbd2b8e639f2ff89bbc7a5730fcc662954303377aac",
-                "sha256:d838c2c0ed6fced7693d5e8ab8e734d5f8fda53a039c0164afb0b82e771e3603"
+                "sha256:028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc",
+                "sha256:82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0"
            ],
-            "markers": "python_version >= '3.6'",
-            "version": "==3.8"
-        },
-        "importlib-metadata": {
-            "hashes": [
-                "sha256:66f342cc6ac9818fc6ff340576acd24d65ba0b3efabb2b4ac08b598965a4a2f1",
-                "sha256:9a547d3bc3608b025f93d403fdd1aae741c24fbb8314df4b155675742ce303c5"
-            ],
-            "markers": "python_version < '3.10'",
-            "version": "==8.4.0"
+            "markers": "python_version >= '3.5'",
+            "version": "==3.7"
        },
        "jinja2": {
            "hashes": [
@ -702,11 +621,10 @@
        },
        "mccabe": {
            "hashes": [
-                "sha256:348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325",
-                "sha256:6c2d30ab6be0e4a46919781807b4f0d834ebdd6c6e3dca0bda5a15f863427b6e"
+                "sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42",
+                "sha256:dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f"
            ],
-            "markers": "python_version >= '3.6'",
-            "version": "==0.7.0"
+            "version": "==0.6.1"
        },
        "nodeenv": {
            "hashes": [
@ -735,19 +653,19 @@
        },
        "pycodestyle": {
            "hashes": [
-                "sha256:41ba0e7afc9752dfb53ced5489e89f8186be00e599e712660695b7a75ff2663f",
-                "sha256:44fe31000b2d866f2e41841b18528a505fbd7fef9017b04eff4e2648a0fadc67"
+                "sha256:514f76d918fcc0b55c6680472f0a37970994e07bbb80725808c17089be302068",
+                "sha256:c389c1d06bf7904078ca03399a4816f974a1d590090fecea0c63ec26ebaf1cef"
            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==2.11.1"
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
+            "version": "==2.7.0"
        },
        "pyflakes": {
            "hashes": [
-                "sha256:4132f6d49cb4dae6819e5379898f2b8cce3c5f23994194c24b77d5da2e36f774",
-                "sha256:a0aae034c444db0071aa077972ba4768d40c830d9539fd45bf4cd3f8f6992efc"
+                "sha256:7893783d01b8a89811dd72d7dfd4d84ff098e5eed95cfa8905b22bbffe52efc3",
+                "sha256:f5bc8ecabc05bb9d291eb5203d6810b49040f6ff446a756326104746cc00c1db"
            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==3.1.0"
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
+            "version": "==2.3.1"
        },
        "python-debian": {
            "hashes": [
@ -837,11 +755,11 @@
        },
        "setuptools": {
            "hashes": [
-                "sha256:0274581a0037b638b9fc1c6883cc71c0210865aaa76073f7882376b641b84e8f",
-                "sha256:a85e96b8be2b906f3e3e789adec6a9323abf79758ecfa3065bd740d81158b11e"
+                "sha256:b208925fcb9f7af924ed2dc04708ea89791e24bde0d3020b27df0e116088b34e",
+                "sha256:d59a3e788ab7e012ab2c4baed1b376da6366883ee20d7a5fc426816e3d7b1193"
            ],
            "markers": "python_version >= '3.8'",
-            "version": "==74.0.0"
+            "version": "==73.0.1"
        },
        "toml": {
            "hashes": [
@ -851,14 +769,6 @@
            "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'",
            "version": "==0.10.2"
        },
-        "tomli": {
-            "hashes": [
-                "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc",
-                "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"
-            ],
-            "markers": "python_version >= '3.7'",
-            "version": "==2.0.1"
-        },
        "urllib3": {
            "hashes": [
                "sha256:a448b2f64d686155468037e1ace9f2d2199776e17f0a46610480d311f73e3472",
@ -877,20 +787,11 @@
        },
        "yapf": {
            "hashes": [
-                "sha256:4dab8a5ed7134e26d57c1647c7483afb3f136878b579062b786c9ba16b94637b",
-                "sha256:adc8b5dd02c0143108878c499284205adb258aad6db6634e5b869e7ee2bd548b"
+                "sha256:408fb9a2b254c302f49db83c59f9aa0b4b0fd0ec25be3a5c51181327922ff63d",
+                "sha256:e3a234ba8455fe201eaa649cdac872d590089a18b661e39bbac7020978dd9c2e"
            ],
            "index": "pypi",
-            "markers": "python_version >= '3.7'",
-            "version": "==0.40.2"
-        },
-        "zipp": {
-            "hashes": [
-                "sha256:9960cd8967c8f85a56f920d5d507274e74f9ff813a0ab8889a5b5be2daf44064",
-                "sha256:c22b14cc4763c5a5b04134207736c107db42e9d3ef2d9779d465f5f1bcba572b"
-            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==3.20.1"
+            "version": "==0.31.0"
        }
    }
 }
--- a/app.py
+++ b/app.py
@ -42,8 +42,5 @@ db = SQLAlchemy(app)
 migrate = Migrate(app, db, compare_type=True)

 app.logger.info("Hello from KI")
+
 from ki import module  # noqa
-from ki import resume
-
-
-app.register_blueprint(resume.bp_resume, url_prefix='/resume')
--- a/ki/models.py
+++ b/ki/models.py
@ -33,7 +33,7 @@ class Profile(db.Model):
    volunteerwork = Column(String(4000), default="")
    freetext = Column(String(4000), default="")

-    availability_status = Column(Boolean, default=False, nullable=False)
+    availability_status = Column(Boolean, default=False)
    availability_text = Column(String(4000), default="")
    availability_hours_per_week = Column(Integer, default=0)

--- a/ki/resume.py
+++ b/ki/resume.py
@ -1,32 +0,0 @@
-# SPDX-FileCopyrightText: WTF Kooperative eG <https://wtf-eg.de/>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
-from flask import Blueprint
-from ki.token_auth import token_auth
-from ki.resume_models import Resume
-
-bp_resume = Blueprint('resume', __name__,
-                      template_folder='templates')
-
-
-@bp_resume.route('/')
-@token_auth
-def show(page):
-    """
-    return the list of resumes as object with data array inside
-    """
-    pass
-
-
-@bp_resume.route("/<resume_id>")
-@token_auth
-def get_resume(resume_id):
-    """
-    lookup for resume with resume_id, check if its from this user
-    and provide its contents in the appropriate format
-    shall support 'format' parameter with values of 'html', 'pdf'
-    if no parameter is given, json is returned
-    """
-    r = Resume()
-    return r.to_dict()
--- a/ki/resume_models.py
+++ b/ki/resume_models.py
@ -1,28 +0,0 @@
-# SPDX-FileCopyrightText: WTF Kooperative eG <https://wtf-eg.de/>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
-
-from sqlalchemy import Column, Integer, String, ForeignKey, JSON
-from sqlalchemy.orm import relationship
-from app import db
-
-
-class Resume(db.Model):
-    __tablename__ = 'resume'
-
-    id = Column(Integer, primary_key=True)
-
-    user_id = Column(Integer, ForeignKey("user.id", ondelete='CASCADE'))
-    label = Column("label", String(50), nullable=True)
-    data = Column('data', JSON)
-
-    user = relationship("User", backref='user', passive_deletes=True)
-
-    def to_dict(self):
-        return {
-            "id": self.id,
-            'user_id': self.user_id,
-            "label": self.label,
-            "data": self.data
-        }
--- a/ki/routes.py
+++ b/ki/routes.py
@ -4,18 +4,41 @@

 import os
 from flask import g, make_response, request, send_file
+from functools import wraps

 from ki.auth import auth
 from ki.handlers import find_profiles as find_profiles_handler
 from ki.handlers import update_profile as update_profile_handler
-from ki.models import ContactType, Language, Skill, User
+from ki.models import ContactType, Language, Skill, Token, User
 from app import app
-from ki.token_auth import token_auth

 content_type_svg = "image/svg+xml"
 content_type_png = "image/png"


+def token_auth(func):
+    @wraps(func)
+    def _token_auth(*args, **kwargs):
+        auth_header = request.headers.get("Authorization")
+
+        if (auth_header is None):
+            return make_response({}, 401)
+
+        if not auth_header.startswith("Bearer"):
+            return make_response({}, 401)
+
+        token = Token.query.filter(Token.token == auth_header[7:]).first()
+
+        if token is None:
+            return make_response({}, 403)
+
+        g.user = token.user
+
+        return func(*args, **kwargs)
+
+    return _token_auth
+
+
 def models_to_list(models):
    models_list = []

--- a/ki/test/test_contacttypes_endpoint.py
+++ b/ki/test/test_contacttypes_endpoint.py
@ -8,7 +8,6 @@ from ki.test.ApiTest import ApiTest


 class TestContactTypesEndpoint(ApiTest):
-
    def test_skills_options(self):
        response = self.client.options("/contacttypes")
        self.assertEqual(response.status_code, 200)
--- a/ki/test/test_find_profiles_endpoint.py
+++ b/ki/test/test_find_profiles_endpoint.py
@ -8,7 +8,6 @@ from ki.test.ApiTest import ApiTest


 class TestFindProfilesEndpoint(ApiTest):
-
    def test_find_profiles_options(self):
        response = self.client.options("/users/profiles")
        self.assertEqual(response.status_code, 200)
--- a/ki/test/test_languages_endpoint.py
+++ b/ki/test/test_languages_endpoint.py
@ -8,7 +8,6 @@ from ki.test.ApiTest import ApiTest


 class TestLanguagesEndpoint(ApiTest):
-
    def test_skills_options(self):
        response = self.client.options("/languages")
        self.assertEqual(response.status_code, 200)
--- a/ki/test/test_login_endpoint.py
+++ b/ki/test/test_login_endpoint.py
@ -10,7 +10,6 @@ from ki.test.ApiTest import ApiTest


 class TestLoginEndpoint(ApiTest):
-
    def test_login(self):
        response1_data = self.login("peter", "geheim")
        response2_data = self.login("peter", "geheim")
--- a/ki/test/test_skills_endpoint.py
+++ b/ki/test/test_skills_endpoint.py
@ -8,7 +8,6 @@ from ki.test.ApiTest import ApiTest


 class TestSkillsEndpoint(ApiTest):
-
    def test_skills_options(self):
        response = self.client.options("/skills")
        self.assertEqual(response.status_code, 200)
--- a/ki/token_auth.py
+++ b/ki/token_auth.py
@ -1,31 +0,0 @@
-# SPDX-FileCopyrightText: WTF Kooperative eG <https://wtf-eg.de/>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
-from flask import g, make_response, request
-from functools import wraps
-
-from ki.models import Token
-
-
-def token_auth(func):
-    @wraps(func)
-    def _token_auth(*args, **kwargs):
-        auth_header = request.headers.get("Authorization")
-
-        if (auth_header is None):
-            return make_response({}, 401)
-
-        if not auth_header.startswith("Bearer"):
-            return make_response({}, 401)
-
-        token = Token.query.filter(Token.token == auth_header[7:]).first()
-
-        if token is None:
-            return make_response({}, 403)
-
-        g.user = token.user
-
-        return func(*args, **kwargs)
-
-    return _token_auth
--- a/migrations/versions/6be5073423b4_add_resume.py
+++ b/migrations/versions/6be5073423b4_add_resume.py
@ -1,35 +0,0 @@
-"""add resume
-
-Revision ID: 6be5073423b4
-Revises: b5023977cbda
-Create Date: 2024-08-30 18:18:14.555874
-
-"""
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision = '6be5073423b4'
-down_revision = 'b5023977cbda'
-branch_labels = None
-depends_on = None
-
-
-def upgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.create_table('resume',
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('user_id', sa.Integer(), nullable=True),
-    sa.Column('label', sa.String(length=50), nullable=True),
-    sa.Column('data', sa.JSON(), nullable=True),
-    sa.ForeignKeyConstraint(['user_id'], ['user.id'], ondelete='CASCADE'),
-    sa.PrimaryKeyConstraint('id')
-    )
-    # ### end Alembic commands ###
-
-
-def downgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_table('resume')
-    # ### end Alembic commands ###