Compare commits
1 Commits
implement_
...
bbcec58d96
Author | SHA1 | Date | |
---|---|---|---|
bbcec58d96 |
@ -27,5 +27,5 @@ repos:
|
|||||||
name: reuse
|
name: reuse
|
||||||
entry: reuse lint
|
entry: reuse lint
|
||||||
language: system
|
language: system
|
||||||
exclude: ^(venv).*$
|
exclude: .*
|
||||||
always_run: true
|
always_run: true
|
||||||
|
2
Pipfile
2
Pipfile
@ -23,7 +23,7 @@ werkzeug = "==2.3.8"
|
|||||||
[dev-packages]
|
[dev-packages]
|
||||||
flake8 = "==6.1.0"
|
flake8 = "==6.1.0"
|
||||||
yapf = "==0.40.2"
|
yapf = "==0.40.2"
|
||||||
pre-commit = "==2.13.0"
|
pre-commit = "==2.21.0"
|
||||||
reuse = "==0.14.0"
|
reuse = "==0.14.0"
|
||||||
|
|
||||||
[requires]
|
[requires]
|
||||||
|
18
Pipfile.lock
generated
18
Pipfile.lock
generated
@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"_meta": {
|
"_meta": {
|
||||||
"hash": {
|
"hash": {
|
||||||
"sha256": "701ece99277177da8e5adf857508e3b83e00e1f75bd20509b370bbe0bd8c008f"
|
"sha256": "29788f069c168dac7994daa8155a5b9bef9c908d4da01f556f882602acb3e989"
|
||||||
},
|
},
|
||||||
"pipfile-spec": 6,
|
"pipfile-spec": 6,
|
||||||
"requires": {
|
"requires": {
|
||||||
@ -726,12 +726,12 @@
|
|||||||
},
|
},
|
||||||
"pre-commit": {
|
"pre-commit": {
|
||||||
"hashes": [
|
"hashes": [
|
||||||
"sha256:764972c60693dc668ba8e86eb29654ec3144501310f7198742a767bec385a378",
|
"sha256:31ef31af7e474a8d8995027fefdfcf509b5c913ff31f2015b4ec4beb26a6f658",
|
||||||
"sha256:b679d0fddd5b9d6d98783ae5f10fd0c4c59954f375b70a58cbe1ce9bcf9809a4"
|
"sha256:e2f91727039fc39a92f58a588a25b87f936de6567eed4f0e673e0507edc75bad"
|
||||||
],
|
],
|
||||||
"index": "pypi",
|
"index": "pypi",
|
||||||
"markers": "python_full_version >= '3.6.1'",
|
"markers": "python_version >= '3.7'",
|
||||||
"version": "==2.13.0"
|
"version": "==2.21.0"
|
||||||
},
|
},
|
||||||
"pycodestyle": {
|
"pycodestyle": {
|
||||||
"hashes": [
|
"hashes": [
|
||||||
@ -843,14 +843,6 @@
|
|||||||
"markers": "python_version >= '3.8'",
|
"markers": "python_version >= '3.8'",
|
||||||
"version": "==74.0.0"
|
"version": "==74.0.0"
|
||||||
},
|
},
|
||||||
"toml": {
|
|
||||||
"hashes": [
|
|
||||||
"sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b",
|
|
||||||
"sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"
|
|
||||||
],
|
|
||||||
"markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'",
|
|
||||||
"version": "==0.10.2"
|
|
||||||
},
|
|
||||||
"tomli": {
|
"tomli": {
|
||||||
"hashes": [
|
"hashes": [
|
||||||
"sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc",
|
"sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc",
|
||||||
|
5
app.py
5
app.py
@ -42,8 +42,5 @@ db = SQLAlchemy(app)
|
|||||||
migrate = Migrate(app, db, compare_type=True)
|
migrate = Migrate(app, db, compare_type=True)
|
||||||
|
|
||||||
app.logger.info("Hello from KI")
|
app.logger.info("Hello from KI")
|
||||||
|
|
||||||
from ki import module # noqa
|
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="")
|
volunteerwork = Column(String(4000), default="")
|
||||||
freetext = 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_text = Column(String(4000), default="")
|
||||||
availability_hours_per_week = Column(Integer, default=0)
|
availability_hours_per_week = Column(Integer, default=0)
|
||||||
|
|
||||||
|
32
ki/resume.py
32
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()
|
|
@ -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
|
|
||||||
}
|
|
28
ki/routes.py
28
ki/routes.py
@ -4,18 +4,42 @@
|
|||||||
|
|
||||||
import os
|
import os
|
||||||
from flask import g, make_response, request, send_file
|
from flask import g, make_response, request, send_file
|
||||||
|
from functools import wraps
|
||||||
|
|
||||||
from ki.auth import auth
|
from ki.auth import auth
|
||||||
from ki.handlers import find_profiles as find_profiles_handler
|
from ki.handlers import find_profiles as find_profiles_handler
|
||||||
from ki.handlers import update_profile as update_profile_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 app import app
|
||||||
from ki.token_auth import token_auth
|
|
||||||
|
|
||||||
content_type_svg = "image/svg+xml"
|
content_type_svg = "image/svg+xml"
|
||||||
content_type_png = "image/png"
|
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):
|
def models_to_list(models):
|
||||||
models_list = []
|
models_list = []
|
||||||
|
|
||||||
|
@ -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
|
|
@ -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 ###
|
|
Reference in New Issue
Block a user