Compare commits
13 Commits
a9536b71b3
...
implement_
Author | SHA1 | Date | |
---|---|---|---|
c4f5979d95 | |||
92f5393a4c | |||
383ef8b512 | |||
033dee7836 | |||
ca81e8bf70
|
|||
d507a20a93 | |||
3f2c23c386
|
|||
b46ac5e379 | |||
fa4429b6ef | |||
7a0f2434db | |||
8c3fe3fe7d | |||
56ade6de68 | |||
28cf714217 |
@ -27,5 +27,5 @@ repos:
|
||||
name: reuse
|
||||
entry: reuse lint
|
||||
language: system
|
||||
exclude: .*
|
||||
exclude: ^(venv).*$
|
||||
always_run: true
|
||||
|
6
Pipfile
6
Pipfile
@ -8,8 +8,8 @@ verify_ssl = true
|
||||
name = "pypi"
|
||||
|
||||
[packages]
|
||||
flask = "==2.0.3"
|
||||
python-dotenv = "==0.17.1"
|
||||
flask = "==2.3.3"
|
||||
python-dotenv = "==0.21.1"
|
||||
flask-migrate = "==3.0.1"
|
||||
flask-sqlalchemy = "==2.5.1"
|
||||
sqlalchemy = "==1.4.53"
|
||||
@ -21,7 +21,7 @@ pymysql = "==1.1.1"
|
||||
werkzeug = "==2.3.8"
|
||||
|
||||
[dev-packages]
|
||||
flake8 = "==3.9.2"
|
||||
flake8 = "==6.1.0"
|
||||
yapf = "==0.40.2"
|
||||
pre-commit = "==2.13.0"
|
||||
reuse = "==0.14.0"
|
||||
|
60
Pipfile.lock
generated
60
Pipfile.lock
generated
@ -1,7 +1,7 @@
|
||||
{
|
||||
"_meta": {
|
||||
"hash": {
|
||||
"sha256": "fb8ceab15e4cbda4656c60279bc884be3167eb8cf77bedc27564a1106f5e6ca4"
|
||||
"sha256": "701ece99277177da8e5adf857508e3b83e00e1f75bd20509b370bbe0bd8c008f"
|
||||
},
|
||||
"pipfile-spec": 6,
|
||||
"requires": {
|
||||
@ -24,6 +24,14 @@
|
||||
"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",
|
||||
@ -34,12 +42,12 @@
|
||||
},
|
||||
"flask": {
|
||||
"hashes": [
|
||||
"sha256:59da8a3170004800a2837844bfa84d49b022550616070f7cb1a659682b2e7c9f",
|
||||
"sha256:e1120c228ca2f553b470df4a5fa927ab66258467526069981b3eb0a91902687d"
|
||||
"sha256:09c347a92aa7ff4a8e7f3206795f30d826654baf38b873d0744cd571ca609efc",
|
||||
"sha256:f69fcd559dc907ed196ab9df0e48471709175e696d6e698dd4dbe940f96ce66b"
|
||||
],
|
||||
"index": "pypi",
|
||||
"markers": "python_version >= '3.6'",
|
||||
"version": "==2.0.3"
|
||||
"markers": "python_version >= '3.8'",
|
||||
"version": "==2.3.3"
|
||||
},
|
||||
"flask-cors": {
|
||||
"hashes": [
|
||||
@ -135,7 +143,7 @@
|
||||
"sha256:66f342cc6ac9818fc6ff340576acd24d65ba0b3efabb2b4ac08b598965a4a2f1",
|
||||
"sha256:9a547d3bc3608b025f93d403fdd1aae741c24fbb8314df4b155675742ce303c5"
|
||||
],
|
||||
"markers": "python_version < '3.9'",
|
||||
"markers": "python_version < '3.10'",
|
||||
"version": "==8.4.0"
|
||||
},
|
||||
"importlib-resources": {
|
||||
@ -266,11 +274,12 @@
|
||||
},
|
||||
"python-dotenv": {
|
||||
"hashes": [
|
||||
"sha256:00aa34e92d992e9f8383730816359647f358f4a3be1ba45e5a5cefd27ee91544",
|
||||
"sha256:b1ae5e9643d5ed987fc57cc2583021e38db531946518130777734f9589b3141f"
|
||||
"sha256:1c93de8f636cde3ce377292818d0e440b6e45a82f215c3744979151fa8151c49",
|
||||
"sha256:41e12e0318bebc859fcc4d97d4db8d20ad21721a6aa5047dd59f090391cb549a"
|
||||
],
|
||||
"index": "pypi",
|
||||
"version": "==0.17.1"
|
||||
"markers": "python_version >= '3.7'",
|
||||
"version": "==0.21.1"
|
||||
},
|
||||
"pyyaml": {
|
||||
"hashes": [
|
||||
@ -578,12 +587,12 @@
|
||||
},
|
||||
"flake8": {
|
||||
"hashes": [
|
||||
"sha256:07528381786f2a6237b061f6e96610a4167b226cb926e2aa2b6b1d78057c576b",
|
||||
"sha256:bf8fd333346d844f616e8d47905ef3a3384edae6b4e9beb0c5101e25e3110907"
|
||||
"sha256:d5b3857f07c030bdb5bf41c7f53799571d75c4491748a3adcd47de929e34cd23",
|
||||
"sha256:ffdfce58ea94c6580c77888a86506937f9a1a227dfcd15f245d694ae20a6b6e5"
|
||||
],
|
||||
"index": "pypi",
|
||||
"markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
|
||||
"version": "==3.9.2"
|
||||
"markers": "python_full_version >= '3.8.1'",
|
||||
"version": "==6.1.0"
|
||||
},
|
||||
"identify": {
|
||||
"hashes": [
|
||||
@ -606,7 +615,7 @@
|
||||
"sha256:66f342cc6ac9818fc6ff340576acd24d65ba0b3efabb2b4ac08b598965a4a2f1",
|
||||
"sha256:9a547d3bc3608b025f93d403fdd1aae741c24fbb8314df4b155675742ce303c5"
|
||||
],
|
||||
"markers": "python_version < '3.9'",
|
||||
"markers": "python_version < '3.10'",
|
||||
"version": "==8.4.0"
|
||||
},
|
||||
"jinja2": {
|
||||
@ -693,10 +702,11 @@
|
||||
},
|
||||
"mccabe": {
|
||||
"hashes": [
|
||||
"sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42",
|
||||
"sha256:dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f"
|
||||
"sha256:348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325",
|
||||
"sha256:6c2d30ab6be0e4a46919781807b4f0d834ebdd6c6e3dca0bda5a15f863427b6e"
|
||||
],
|
||||
"version": "==0.6.1"
|
||||
"markers": "python_version >= '3.6'",
|
||||
"version": "==0.7.0"
|
||||
},
|
||||
"nodeenv": {
|
||||
"hashes": [
|
||||
@ -725,19 +735,19 @@
|
||||
},
|
||||
"pycodestyle": {
|
||||
"hashes": [
|
||||
"sha256:514f76d918fcc0b55c6680472f0a37970994e07bbb80725808c17089be302068",
|
||||
"sha256:c389c1d06bf7904078ca03399a4816f974a1d590090fecea0c63ec26ebaf1cef"
|
||||
"sha256:41ba0e7afc9752dfb53ced5489e89f8186be00e599e712660695b7a75ff2663f",
|
||||
"sha256:44fe31000b2d866f2e41841b18528a505fbd7fef9017b04eff4e2648a0fadc67"
|
||||
],
|
||||
"markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
|
||||
"version": "==2.7.0"
|
||||
"markers": "python_version >= '3.8'",
|
||||
"version": "==2.11.1"
|
||||
},
|
||||
"pyflakes": {
|
||||
"hashes": [
|
||||
"sha256:7893783d01b8a89811dd72d7dfd4d84ff098e5eed95cfa8905b22bbffe52efc3",
|
||||
"sha256:f5bc8ecabc05bb9d291eb5203d6810b49040f6ff446a756326104746cc00c1db"
|
||||
"sha256:4132f6d49cb4dae6819e5379898f2b8cce3c5f23994194c24b77d5da2e36f774",
|
||||
"sha256:a0aae034c444db0071aa077972ba4768d40c830d9539fd45bf4cd3f8f6992efc"
|
||||
],
|
||||
"markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
|
||||
"version": "==2.3.1"
|
||||
"markers": "python_version >= '3.8'",
|
||||
"version": "==3.1.0"
|
||||
},
|
||||
"python-debian": {
|
||||
"hashes": [
|
||||
|
5
app.py
5
app.py
@ -42,5 +42,8 @@ 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')
|
||||
|
@ -33,7 +33,7 @@ class Profile(db.Model):
|
||||
volunteerwork = Column(String(4000), default="")
|
||||
freetext = Column(String(4000), default="")
|
||||
|
||||
availability_status = Column(Boolean, default=False)
|
||||
availability_status = Column(Boolean, default=False, nullable=False)
|
||||
availability_text = Column(String(4000), default="")
|
||||
availability_hours_per_week = Column(Integer, default=0)
|
||||
|
||||
|
32
ki/resume.py
Normal file
32
ki/resume.py
Normal file
@ -0,0 +1,32 @@
|
||||
# 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()
|
28
ki/resume_models.py
Normal file
28
ki/resume_models.py
Normal file
@ -0,0 +1,28 @@
|
||||
# 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
|
||||
}
|
28
ki/routes.py
28
ki/routes.py
@ -4,42 +4,18 @@
|
||||
|
||||
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, Token, User
|
||||
from ki.models import ContactType, Language, Skill, 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 = []
|
||||
|
||||
|
31
ki/token_auth.py
Normal file
31
ki/token_auth.py
Normal file
@ -0,0 +1,31 @@
|
||||
# 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
|
35
migrations/versions/6be5073423b4_add_resume.py
Normal file
35
migrations/versions/6be5073423b4_add_resume.py
Normal file
@ -0,0 +1,35 @@
|
||||
"""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 ###
|
Reference in New Issue
Block a user