From 242e29c8a6d86937c8a7f1e48deb262958cb08f8 Mon Sep 17 00:00:00 2001 From: JulienAldon Date: Thu, 19 Feb 2026 23:38:26 +0100 Subject: [PATCH] add workflow --- .gitea/workflows/deploy.yaml | 17 ++ backend/README.md | 13 ++ backend/alembic.ini | 147 +++++++++++++++++ backend/alembic/README | 1 + backend/alembic/env.py | 81 +++++++++ backend/alembic/script.py.mako | 29 ++++ .../370137544ee6_initial_repository.py | 155 ++++++++++++++++++ backend/src/auth/auth.py | 34 ++-- backend/src/contracts/generate_contract.py | 7 +- backend/src/main.py | 5 +- backend/src/settings.py | 1 - {amapcontract => bruno}/bruno.json | 2 +- {amapcontract => bruno}/collection.bru | 0 {amapcontract => bruno}/forms/Create.bru | 0 {amapcontract => bruno}/forms/Delete one.bru | 0 {amapcontract => bruno}/forms/Get all.bru | 0 {amapcontract => bruno}/forms/Get one.bru | 0 {amapcontract => bruno}/forms/Update one.bru | 0 {amapcontract => bruno}/forms/folder.bru | 0 {amapcontract => bruno}/productors/Create.bru | 0 .../productors/Delete one.bru | 0 .../productors/Get all.bru | 0 .../productors/Get one.bru | 0 .../productors/Update one.bru | 0 {amapcontract => bruno}/productors/folder.bru | 0 {amapcontract => bruno}/products/Create.bru | 0 .../products/Delete one.bru | 0 {amapcontract => bruno}/products/Get all.bru | 0 {amapcontract => bruno}/products/Get one.bru | 0 .../products/Update one.bru | 0 {amapcontract => bruno}/products/folder.bru | 0 {amapcontract => bruno}/shipments/Create.bru | 0 .../shipments/Delete one.bru | 0 {amapcontract => bruno}/shipments/Get all.bru | 0 {amapcontract => bruno}/shipments/Get one.bru | 0 .../shipments/Update one.bru | 0 {amapcontract => bruno}/shipments/folder.bru | 0 {amapcontract => bruno}/users/Create.bru | 0 {amapcontract => bruno}/users/Delete one.bru | 0 {amapcontract => bruno}/users/Get all.bru | 0 {amapcontract => bruno}/users/Get one.bru | 0 {amapcontract => bruno}/users/Update one.bru | 0 {amapcontract => bruno}/users/folder.bru | 0 docker-compose.dev.yaml | 55 +++++++ docker-compose.yaml | 7 +- frontend/Dockerfile.dev | 12 ++ 46 files changed, 536 insertions(+), 30 deletions(-) create mode 100644 .gitea/workflows/deploy.yaml create mode 100644 backend/alembic.ini create mode 100644 backend/alembic/README create mode 100644 backend/alembic/env.py create mode 100644 backend/alembic/script.py.mako create mode 100644 backend/alembic/versions/370137544ee6_initial_repository.py rename {amapcontract => bruno}/bruno.json (77%) rename {amapcontract => bruno}/collection.bru (100%) rename {amapcontract => bruno}/forms/Create.bru (100%) rename {amapcontract => bruno}/forms/Delete one.bru (100%) rename {amapcontract => bruno}/forms/Get all.bru (100%) rename {amapcontract => bruno}/forms/Get one.bru (100%) rename {amapcontract => bruno}/forms/Update one.bru (100%) rename {amapcontract => bruno}/forms/folder.bru (100%) rename {amapcontract => bruno}/productors/Create.bru (100%) rename {amapcontract => bruno}/productors/Delete one.bru (100%) rename {amapcontract => bruno}/productors/Get all.bru (100%) rename {amapcontract => bruno}/productors/Get one.bru (100%) rename {amapcontract => bruno}/productors/Update one.bru (100%) rename {amapcontract => bruno}/productors/folder.bru (100%) rename {amapcontract => bruno}/products/Create.bru (100%) rename {amapcontract => bruno}/products/Delete one.bru (100%) rename {amapcontract => bruno}/products/Get all.bru (100%) rename {amapcontract => bruno}/products/Get one.bru (100%) rename {amapcontract => bruno}/products/Update one.bru (100%) rename {amapcontract => bruno}/products/folder.bru (100%) rename {amapcontract => bruno}/shipments/Create.bru (100%) rename {amapcontract => bruno}/shipments/Delete one.bru (100%) rename {amapcontract => bruno}/shipments/Get all.bru (100%) rename {amapcontract => bruno}/shipments/Get one.bru (100%) rename {amapcontract => bruno}/shipments/Update one.bru (100%) rename {amapcontract => bruno}/shipments/folder.bru (100%) rename {amapcontract => bruno}/users/Create.bru (100%) rename {amapcontract => bruno}/users/Delete one.bru (100%) rename {amapcontract => bruno}/users/Get all.bru (100%) rename {amapcontract => bruno}/users/Get one.bru (100%) rename {amapcontract => bruno}/users/Update one.bru (100%) rename {amapcontract => bruno}/users/folder.bru (100%) create mode 100644 docker-compose.dev.yaml create mode 100644 frontend/Dockerfile.dev diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml new file mode 100644 index 0000000..74c9d6f --- /dev/null +++ b/.gitea/workflows/deploy.yaml @@ -0,0 +1,17 @@ +name: Deploy Amap +on: + push: + branches: + - main + workflow_dispatch: +jobs: + deploy: + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + - name: Build & deploy + run: | + docker compose -f docker-compose.yaml up -d --build + docker compose -f docker-compose.yaml exec backend alembic upgrade head \ No newline at end of file diff --git a/backend/README.md b/backend/README.md index 216cc47..a017a4d 100644 --- a/backend/README.md +++ b/backend/README.md @@ -18,6 +18,19 @@ hatch shell fastapi dev src/main.py ``` +### Migration +This repository use `alembic` for migrations + +On first installation copy the `alembic.ini.example` to `alembic.ini` +#### Create migration +```console +alembic revision --autogenerate -m "message" +``` +#### Apply migration +```console +alembic upgrade head +``` + ## License `backend` is distributed under the terms of the [MIT](https://spdx.org/licenses/MIT.html) license. diff --git a/backend/alembic.ini b/backend/alembic.ini new file mode 100644 index 0000000..91fd6de --- /dev/null +++ b/backend/alembic.ini @@ -0,0 +1,147 @@ +# A generic, single database configuration. + +[alembic] +# path to migration scripts. +# this is typically a path given in POSIX (e.g. forward slashes) +# format, relative to the token %(here)s which refers to the location of this +# ini file +script_location = %(here)s/alembic + +# template used to generate migration file names; The default value is %%(rev)s_%%(slug)s +# Uncomment the line below if you want the files to be prepended with date and time +# see https://alembic.sqlalchemy.org/en/latest/tutorial.html#editing-the-ini-file +# for all available tokens +# file_template = %%(year)d_%%(month).2d_%%(day).2d_%%(hour).2d%%(minute).2d-%%(rev)s_%%(slug)s +# Or organize into date-based subdirectories (requires recursive_version_locations = true) +# file_template = %%(year)d/%%(month).2d/%%(day).2d_%%(hour).2d%%(minute).2d_%%(second).2d_%%(rev)s_%%(slug)s + +# sys.path path, will be prepended to sys.path if present. +# defaults to the current working directory. for multiple paths, the path separator +# is defined by "path_separator" below. +prepend_sys_path = . + + +# timezone to use when rendering the date within the migration file +# as well as the filename. +# If specified, requires the tzdata library which can be installed by adding +# `alembic[tz]` to the pip requirements. +# string value is passed to ZoneInfo() +# leave blank for localtime +# timezone = + +# max length of characters to apply to the "slug" field +# truncate_slug_length = 40 + +# set to 'true' to run the environment during +# the 'revision' command, regardless of autogenerate +# revision_environment = false + +# set to 'true' to allow .pyc and .pyo files without +# a source .py file to be detected as revisions in the +# versions/ directory +# sourceless = false + +# version location specification; This defaults +# to /versions. When using multiple version +# directories, initial revisions must be specified with --version-path. +# The path separator used here should be the separator specified by "path_separator" +# below. +# version_locations = %(here)s/bar:%(here)s/bat:%(here)s/alembic/versions + +# path_separator; This indicates what character is used to split lists of file +# paths, including version_locations and prepend_sys_path within configparser +# files such as alembic.ini. +# The default rendered in new alembic.ini files is "os", which uses os.pathsep +# to provide os-dependent path splitting. +# +# Note that in order to support legacy alembic.ini files, this default does NOT +# take place if path_separator is not present in alembic.ini. If this +# option is omitted entirely, fallback logic is as follows: +# +# 1. Parsing of the version_locations option falls back to using the legacy +# "version_path_separator" key, which if absent then falls back to the legacy +# behavior of splitting on spaces and/or commas. +# 2. Parsing of the prepend_sys_path option falls back to the legacy +# behavior of splitting on spaces, commas, or colons. +# +# Valid values for path_separator are: +# +# path_separator = : +# path_separator = ; +# path_separator = space +# path_separator = newline +# +# Use os.pathsep. Default configuration used for new projects. +path_separator = os + +# set to 'true' to search source files recursively +# in each "version_locations" directory +# new in Alembic version 1.10 +# recursive_version_locations = false + +# the output encoding used when revision files +# are written from script.py.mako +# output_encoding = utf-8 + +# database URL. This is consumed by the user-maintained env.py script only. +# other means of configuring database URLs may be customized within the env.py +# file. + +[post_write_hooks] +# post_write_hooks defines scripts or Python functions that are run +# on newly generated revision scripts. See the documentation for further +# detail and examples + +# format using "black" - use the console_scripts runner, against the "black" entrypoint +# hooks = black +# black.type = console_scripts +# black.entrypoint = black +# black.options = -l 79 REVISION_SCRIPT_FILENAME + +# lint with attempts to fix using "ruff" - use the module runner, against the "ruff" module +# hooks = ruff +# ruff.type = module +# ruff.module = ruff +# ruff.options = check --fix REVISION_SCRIPT_FILENAME + +# Alternatively, use the exec runner to execute a binary found on your PATH +# hooks = ruff +# ruff.type = exec +# ruff.executable = ruff +# ruff.options = check --fix REVISION_SCRIPT_FILENAME + +# Logging configuration. This is also consumed by the user-maintained +# env.py script only. +[loggers] +keys = root,sqlalchemy,alembic + +[handlers] +keys = console + +[formatters] +keys = generic + +[logger_root] +level = WARNING +handlers = console +qualname = + +[logger_sqlalchemy] +level = WARNING +handlers = +qualname = sqlalchemy.engine + +[logger_alembic] +level = INFO +handlers = +qualname = alembic + +[handler_console] +class = StreamHandler +args = (sys.stderr,) +level = NOTSET +formatter = generic + +[formatter_generic] +format = %(levelname)-5.5s [%(name)s] %(message)s +datefmt = %H:%M:%S diff --git a/backend/alembic/README b/backend/alembic/README new file mode 100644 index 0000000..98e4f9c --- /dev/null +++ b/backend/alembic/README @@ -0,0 +1 @@ +Generic single-database configuration. \ No newline at end of file diff --git a/backend/alembic/env.py b/backend/alembic/env.py new file mode 100644 index 0000000..567f10a --- /dev/null +++ b/backend/alembic/env.py @@ -0,0 +1,81 @@ +from logging.config import fileConfig + +from sqlalchemy import engine_from_config +from sqlalchemy import pool + +from alembic import context + +from sqlmodel import SQLModel +from src.settings import settings + +# this is the Alembic Config object, which provides +# access to the values within the .ini file in use. +config = context.config + +# Interpret the config file for Python logging. +# This line sets up loggers basically. +if config.config_file_name is not None: + fileConfig(config.config_file_name) + +# add your model's MetaData object here +# for 'autogenerate' support +# from myapp import mymodel +# target_metadata = mymodel.Base.metadata +target_metadata = SQLModel.metadata + +# other values from the config, defined by the needs of env.py, +# can be acquired: +config.set_main_option("sqlalchemy.url", f'postgresql://{settings.db_user}:{settings.db_pass}@{settings.db_host}:5432/{settings.db_name}') +# ... etc. + + +def run_migrations_offline() -> None: + """Run migrations in 'offline' mode. + + This configures the context with just a URL + and not an Engine, though an Engine is acceptable + here as well. By skipping the Engine creation + we don't even need a DBAPI to be available. + + Calls to context.execute() here emit the given string to the + script output. + + """ + url = config.get_main_option("sqlalchemy.url") + context.configure( + url=url, + target_metadata=target_metadata, + literal_binds=True, + dialect_opts={"paramstyle": "named"}, + ) + + with context.begin_transaction(): + context.run_migrations() + + +def run_migrations_online() -> None: + """Run migrations in 'online' mode. + + In this scenario we need to create an Engine + and associate a connection with the context. + + """ + connectable = engine_from_config( + config.get_section(config.config_ini_section, {}), + prefix="sqlalchemy.", + poolclass=pool.NullPool, + ) + + with connectable.connect() as connection: + context.configure( + connection=connection, target_metadata=target_metadata + ) + + with context.begin_transaction(): + context.run_migrations() + + +if context.is_offline_mode(): + run_migrations_offline() +else: + run_migrations_online() diff --git a/backend/alembic/script.py.mako b/backend/alembic/script.py.mako new file mode 100644 index 0000000..5008fb8 --- /dev/null +++ b/backend/alembic/script.py.mako @@ -0,0 +1,29 @@ +"""${message} + +Revision ID: ${up_revision} +Revises: ${down_revision | comma,n} +Create Date: ${create_date} + +""" +from typing import Sequence, Union + +from alembic import op +import sqlalchemy as sa +${imports if imports else ""} +import sqlmodel.sql.sqltypes + +# revision identifiers, used by Alembic. +revision: str = ${repr(up_revision)} +down_revision: Union[str, Sequence[str], None] = ${repr(down_revision)} +branch_labels: Union[str, Sequence[str], None] = ${repr(branch_labels)} +depends_on: Union[str, Sequence[str], None] = ${repr(depends_on)} + + +def upgrade() -> None: + """Upgrade schema.""" + ${upgrades if upgrades else "pass"} + + +def downgrade() -> None: + """Downgrade schema.""" + ${downgrades if downgrades else "pass"} diff --git a/backend/alembic/versions/370137544ee6_initial_repository.py b/backend/alembic/versions/370137544ee6_initial_repository.py new file mode 100644 index 0000000..089e8f4 --- /dev/null +++ b/backend/alembic/versions/370137544ee6_initial_repository.py @@ -0,0 +1,155 @@ +"""Initial repository + +Revision ID: 370137544ee6 +Revises: +Create Date: 2026-02-19 22:55:19.804879 + +""" +from typing import Sequence, Union + +from alembic import op +import sqlalchemy as sa +from sqlalchemy.dialects import postgresql +import sqlmodel.sql.sqltypes + +# revision identifiers, used by Alembic. +revision: str = '370137544ee6' +down_revision: Union[str, Sequence[str], None] = None +branch_labels: Union[str, Sequence[str], None] = None +depends_on: Union[str, Sequence[str], None] = None + + +def upgrade() -> None: + """Upgrade schema.""" + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('template') + op.drop_table('user') + op.drop_table('form') + op.drop_table('usercontracttypelink') + op.drop_table('shipment') + op.drop_table('cheque') + op.drop_table('productor') + op.drop_table('paymentmethod') + op.drop_table('contract') + op.drop_table('contractproduct') + op.drop_table('contracttype') + op.drop_table('product') + op.drop_table('shipmentproductlink') + # ### end Alembic commands ### + + +def downgrade() -> None: + """Downgrade schema.""" + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('shipmentproductlink', + sa.Column('shipment_id', sa.INTEGER(), autoincrement=False, nullable=False), + sa.Column('product_id', sa.INTEGER(), autoincrement=False, nullable=False), + sa.ForeignKeyConstraint(['product_id'], ['product.id'], name=op.f('shipmentproductlink_product_id_fkey')), + sa.ForeignKeyConstraint(['shipment_id'], ['shipment.id'], name=op.f('shipmentproductlink_shipment_id_fkey')), + sa.PrimaryKeyConstraint('shipment_id', 'product_id', name=op.f('shipmentproductlink_pkey')) + ) + op.create_table('product', + sa.Column('name', sa.VARCHAR(), autoincrement=False, nullable=False), + sa.Column('unit', postgresql.ENUM('GRAMS', 'KILO', 'PIECE', name='unit'), autoincrement=False, nullable=False), + sa.Column('price', sa.DOUBLE_PRECISION(precision=53), autoincrement=False, nullable=True), + sa.Column('price_kg', sa.DOUBLE_PRECISION(precision=53), autoincrement=False, nullable=True), + sa.Column('quantity', sa.DOUBLE_PRECISION(precision=53), autoincrement=False, nullable=True), + sa.Column('quantity_unit', sa.VARCHAR(), autoincrement=False, nullable=True), + sa.Column('type', postgresql.ENUM('OCCASIONAL', 'RECCURENT', name='producttype'), autoincrement=False, nullable=False), + sa.Column('productor_id', sa.INTEGER(), autoincrement=False, nullable=True), + sa.Column('id', sa.INTEGER(), autoincrement=True, nullable=False), + sa.ForeignKeyConstraint(['productor_id'], ['productor.id'], name=op.f('product_productor_id_fkey')), + sa.PrimaryKeyConstraint('id', name=op.f('product_pkey')) + ) + op.create_table('contracttype', + sa.Column('id', sa.INTEGER(), autoincrement=True, nullable=False), + sa.Column('name', sa.VARCHAR(), autoincrement=False, nullable=False), + sa.PrimaryKeyConstraint('id', name=op.f('contracttype_pkey')) + ) + op.create_table('contractproduct', + sa.Column('product_id', sa.INTEGER(), autoincrement=False, nullable=False), + sa.Column('shipment_id', sa.INTEGER(), autoincrement=False, nullable=True), + sa.Column('quantity', sa.DOUBLE_PRECISION(precision=53), autoincrement=False, nullable=False), + sa.Column('id', sa.INTEGER(), autoincrement=True, nullable=False), + sa.Column('contract_id', sa.INTEGER(), autoincrement=False, nullable=False), + sa.ForeignKeyConstraint(['contract_id'], ['contract.id'], name=op.f('contractproduct_contract_id_fkey'), ondelete='CASCADE'), + sa.ForeignKeyConstraint(['product_id'], ['product.id'], name=op.f('contractproduct_product_id_fkey'), ondelete='CASCADE'), + sa.ForeignKeyConstraint(['shipment_id'], ['shipment.id'], name=op.f('contractproduct_shipment_id_fkey'), ondelete='CASCADE'), + sa.PrimaryKeyConstraint('id', name=op.f('contractproduct_pkey')) + ) + op.create_table('contract', + sa.Column('firstname', sa.VARCHAR(), autoincrement=False, nullable=False), + sa.Column('lastname', sa.VARCHAR(), autoincrement=False, nullable=False), + sa.Column('email', sa.VARCHAR(), autoincrement=False, nullable=False), + sa.Column('phone', sa.VARCHAR(), autoincrement=False, nullable=False), + sa.Column('payment_method', sa.VARCHAR(), autoincrement=False, nullable=False), + sa.Column('cheque_quantity', sa.INTEGER(), autoincrement=False, nullable=False), + sa.Column('id', sa.INTEGER(), autoincrement=True, nullable=False), + sa.Column('form_id', sa.INTEGER(), autoincrement=False, nullable=False), + sa.Column('file', postgresql.BYTEA(), autoincrement=False, nullable=True), + sa.Column('total_price', sa.DOUBLE_PRECISION(precision=53), autoincrement=False, nullable=True), + sa.ForeignKeyConstraint(['form_id'], ['form.id'], name=op.f('contract_form_id_fkey'), ondelete='CASCADE'), + sa.PrimaryKeyConstraint('id', name=op.f('contract_pkey')) + ) + op.create_table('paymentmethod', + sa.Column('name', sa.VARCHAR(), autoincrement=False, nullable=False), + sa.Column('details', sa.VARCHAR(), autoincrement=False, nullable=False), + sa.Column('id', sa.INTEGER(), autoincrement=True, nullable=False), + sa.Column('productor_id', sa.INTEGER(), autoincrement=False, nullable=False), + sa.ForeignKeyConstraint(['productor_id'], ['productor.id'], name=op.f('paymentmethod_productor_id_fkey'), ondelete='CASCADE'), + sa.PrimaryKeyConstraint('id', name=op.f('paymentmethod_pkey')) + ) + op.create_table('productor', + sa.Column('name', sa.VARCHAR(), autoincrement=False, nullable=False), + sa.Column('address', sa.VARCHAR(), autoincrement=False, nullable=False), + sa.Column('type', sa.VARCHAR(), autoincrement=False, nullable=False), + sa.Column('id', sa.INTEGER(), autoincrement=True, nullable=False), + sa.PrimaryKeyConstraint('id', name=op.f('productor_pkey')) + ) + op.create_table('cheque', + sa.Column('name', sa.VARCHAR(), autoincrement=False, nullable=False), + sa.Column('value', sa.VARCHAR(), autoincrement=False, nullable=False), + sa.Column('id', sa.INTEGER(), autoincrement=True, nullable=False), + sa.Column('contract_id', sa.INTEGER(), autoincrement=False, nullable=False), + sa.ForeignKeyConstraint(['contract_id'], ['contract.id'], name=op.f('cheque_contract_id_fkey'), ondelete='CASCADE'), + sa.PrimaryKeyConstraint('id', name=op.f('cheque_pkey')) + ) + op.create_table('shipment', + sa.Column('name', sa.VARCHAR(), autoincrement=False, nullable=False), + sa.Column('date', sa.DATE(), autoincrement=False, nullable=False), + sa.Column('form_id', sa.INTEGER(), autoincrement=False, nullable=True), + sa.Column('id', sa.INTEGER(), autoincrement=True, nullable=False), + sa.ForeignKeyConstraint(['form_id'], ['form.id'], name=op.f('shipment_form_id_fkey'), ondelete='CASCADE'), + sa.PrimaryKeyConstraint('id', name=op.f('shipment_pkey')) + ) + op.create_table('usercontracttypelink', + sa.Column('user_id', sa.INTEGER(), autoincrement=False, nullable=False), + sa.Column('contract_type_id', sa.INTEGER(), autoincrement=False, nullable=False), + sa.ForeignKeyConstraint(['contract_type_id'], ['contracttype.id'], name=op.f('usercontracttypelink_contract_type_id_fkey')), + sa.ForeignKeyConstraint(['user_id'], ['user.id'], name=op.f('usercontracttypelink_user_id_fkey')), + sa.PrimaryKeyConstraint('user_id', 'contract_type_id', name=op.f('usercontracttypelink_pkey')) + ) + op.create_table('form', + sa.Column('name', sa.VARCHAR(), autoincrement=False, nullable=False), + sa.Column('productor_id', sa.INTEGER(), autoincrement=False, nullable=True), + sa.Column('referer_id', sa.INTEGER(), autoincrement=False, nullable=True), + sa.Column('season', sa.VARCHAR(), autoincrement=False, nullable=False), + sa.Column('start', sa.DATE(), autoincrement=False, nullable=False), + sa.Column('end', sa.DATE(), autoincrement=False, nullable=False), + sa.Column('minimum_shipment_value', sa.DOUBLE_PRECISION(precision=53), autoincrement=False, nullable=True), + sa.Column('id', sa.INTEGER(), autoincrement=True, nullable=False), + sa.ForeignKeyConstraint(['productor_id'], ['productor.id'], name=op.f('form_productor_id_fkey')), + sa.ForeignKeyConstraint(['referer_id'], ['user.id'], name=op.f('form_referer_id_fkey')), + sa.PrimaryKeyConstraint('id', name=op.f('form_pkey')) + ) + op.create_table('user', + sa.Column('name', sa.VARCHAR(), autoincrement=False, nullable=False), + sa.Column('email', sa.VARCHAR(), autoincrement=False, nullable=False), + sa.Column('id', sa.INTEGER(), autoincrement=True, nullable=False), + sa.PrimaryKeyConstraint('id', name=op.f('user_pkey')) + ) + op.create_table('template', + sa.Column('id', sa.INTEGER(), autoincrement=True, nullable=False), + sa.PrimaryKeyConstraint('id', name=op.f('template_pkey')) + ) + # ### end Alembic commands ### diff --git a/backend/src/auth/auth.py b/backend/src/auth/auth.py index 02f2fc9..d092f7b 100644 --- a/backend/src/auth/auth.py +++ b/backend/src/auth/auth.py @@ -22,9 +22,7 @@ jwk_client = PyJWKClient(JWKS_URL) security = HTTPBearer() @router.get('/logout') -def logout( - refresh_token: Annotated[str | None, Cookie()] = None, -): +def logout(): params = { 'client_id': settings.keycloak_client_id, 'post_logout_redirect_uri': settings.origins, @@ -34,26 +32,20 @@ def logout( key='access_token', path='/', secure=not settings.debug, - samesite='lax', + samesite='strict', ) response.delete_cookie( key='refresh_token', path='/', secure=not settings.debug, - samesite='lax', + samesite='strict', ) response.delete_cookie( key='id_token', path='/', secure=not settings.debug, - samesite='lax', + samesite='strict', ) - # if refresh_token: - # requests.post(LOGOUT_URL, data={ - # 'client_id': settings.keycloak_client_id, - # 'client_secret': settings.keycloak_client_secret, - # 'refresh_token': refresh_token - # }) return response @@ -127,7 +119,7 @@ def callback(code: str, session: Session = Depends(get_session)): value=token_data['access_token'], httponly=True, secure=not settings.debug, - samesite='lax', + samesite='strict', max_age=settings.max_age ) response.set_cookie( @@ -135,7 +127,7 @@ def callback(code: str, session: Session = Depends(get_session)): value=token_data['refresh_token'] or '', httponly=True, secure=not settings.debug, - samesite='lax', + samesite='strict', max_age=30 * 24 * settings.max_age ) response.set_cookie( @@ -143,7 +135,7 @@ def callback(code: str, session: Session = Depends(get_session)): value=token_data['id_token'], httponly=True, secure=not settings.debug, - samesite='lax', + samesite='strict', max_age=settings.max_age ) @@ -152,15 +144,15 @@ def callback(code: str, session: Session = Depends(get_session)): def verify_token(token: str): try: signing_key = jwk_client.get_signing_key_from_jwt(token) - decoded = jwt.decode(token, options={'verify_signature': False}) - payload = jwt.decode( + decoded = jwt.decode( token, signing_key.key, algorithms=['RS256'], audience=settings.keycloak_client_id, issuer=ISSUER, + leeway=60, ) - return payload + return decoded except jwt.ExpiredSignatureError: raise HTTPException(status_code=401, detail=messages.tokenexipired) except jwt.InvalidTokenError: @@ -210,7 +202,7 @@ def refresh_token(refresh_token: Annotated[str | None, Cookie()] = None): value=token_data['access_token'], httponly=True, secure=True if settings.debug == False else True, - samesite='lax', + samesite='strict', max_age=settings.max_age ) response.set_cookie( @@ -218,7 +210,7 @@ def refresh_token(refresh_token: Annotated[str | None, Cookie()] = None): value=token_data['refresh_token'] or '', httponly=True, secure=True if settings.debug == False else True, - samesite='lax', + samesite='strict', max_age=30 * 24 * settings.max_age ) response.set_cookie( @@ -226,7 +218,7 @@ def refresh_token(refresh_token: Annotated[str | None, Cookie()] = None): value=token_data['id_token'], httponly=True, secure=not settings.debug, - samesite='lax', + samesite='strict', max_age=settings.max_age ) return response diff --git a/backend/src/contracts/generate_contract.py b/backend/src/contracts/generate_contract.py index 9e27046..9f00540 100644 --- a/backend/src/contracts/generate_contract.py +++ b/backend/src/contracts/generate_contract.py @@ -5,6 +5,8 @@ import html from weasyprint import HTML import io +import pathlib + def generate_html_contract( contract: models.Contract, cheques: list[dict], @@ -13,7 +15,7 @@ def generate_html_contract( recurrent_price: float, total_price: float ): - template_dir = "./src/contracts/templates" + template_dir = pathlib.Path().resolve() + "/src/contracts/templates" template_loader = jinja2.FileSystemLoader(searchpath=template_dir) template_env = jinja2.Environment(loader=template_loader, autoescape=jinja2.select_autoescape(["html", "xml"])) template_file = "layout.html" @@ -57,7 +59,8 @@ def generate_html_contract( return HTML( string=output_text, - base_url=template_dir + base_url=template_dir, + **options ).write_pdf() from odfdo import Document, Table, Row, Cell diff --git a/backend/src/main.py b/backend/src/main.py index e931423..5b1e638 100644 --- a/backend/src/main.py +++ b/backend/src/main.py @@ -12,7 +12,7 @@ from src.users.users import router as users_router from src.auth.auth import router as auth_router from src.shipments.shipments import router as shipment_router from src.settings import settings -from src.database import engine +from src.database import engine, create_all_tables app = FastAPI() @@ -37,4 +37,5 @@ app.include_router(users_router, prefix="/api") app.include_router(auth_router, prefix="/api") app.include_router(shipment_router, prefix="/api") -SQLModel.metadata.create_all(engine) \ No newline at end of file +if settings.debug == True: + create_all_tables() \ No newline at end of file diff --git a/backend/src/settings.py b/backend/src/settings.py index 22e703d..e646bbd 100644 --- a/backend/src/settings.py +++ b/backend/src/settings.py @@ -12,7 +12,6 @@ class Settings(BaseSettings): keycloak_client_id: str keycloak_client_secret: str keycloak_redirect_uri: str - vite_api_url: str max_age: int debug: bool diff --git a/amapcontract/bruno.json b/bruno/bruno.json similarity index 77% rename from amapcontract/bruno.json rename to bruno/bruno.json index b314673..b271425 100644 --- a/amapcontract/bruno.json +++ b/bruno/bruno.json @@ -1,6 +1,6 @@ { "version": "1", - "name": "amapcontract", + "name": "bruno", "type": "collection", "ignore": [ "node_modules", diff --git a/amapcontract/collection.bru b/bruno/collection.bru similarity index 100% rename from amapcontract/collection.bru rename to bruno/collection.bru diff --git a/amapcontract/forms/Create.bru b/bruno/forms/Create.bru similarity index 100% rename from amapcontract/forms/Create.bru rename to bruno/forms/Create.bru diff --git a/amapcontract/forms/Delete one.bru b/bruno/forms/Delete one.bru similarity index 100% rename from amapcontract/forms/Delete one.bru rename to bruno/forms/Delete one.bru diff --git a/amapcontract/forms/Get all.bru b/bruno/forms/Get all.bru similarity index 100% rename from amapcontract/forms/Get all.bru rename to bruno/forms/Get all.bru diff --git a/amapcontract/forms/Get one.bru b/bruno/forms/Get one.bru similarity index 100% rename from amapcontract/forms/Get one.bru rename to bruno/forms/Get one.bru diff --git a/amapcontract/forms/Update one.bru b/bruno/forms/Update one.bru similarity index 100% rename from amapcontract/forms/Update one.bru rename to bruno/forms/Update one.bru diff --git a/amapcontract/forms/folder.bru b/bruno/forms/folder.bru similarity index 100% rename from amapcontract/forms/folder.bru rename to bruno/forms/folder.bru diff --git a/amapcontract/productors/Create.bru b/bruno/productors/Create.bru similarity index 100% rename from amapcontract/productors/Create.bru rename to bruno/productors/Create.bru diff --git a/amapcontract/productors/Delete one.bru b/bruno/productors/Delete one.bru similarity index 100% rename from amapcontract/productors/Delete one.bru rename to bruno/productors/Delete one.bru diff --git a/amapcontract/productors/Get all.bru b/bruno/productors/Get all.bru similarity index 100% rename from amapcontract/productors/Get all.bru rename to bruno/productors/Get all.bru diff --git a/amapcontract/productors/Get one.bru b/bruno/productors/Get one.bru similarity index 100% rename from amapcontract/productors/Get one.bru rename to bruno/productors/Get one.bru diff --git a/amapcontract/productors/Update one.bru b/bruno/productors/Update one.bru similarity index 100% rename from amapcontract/productors/Update one.bru rename to bruno/productors/Update one.bru diff --git a/amapcontract/productors/folder.bru b/bruno/productors/folder.bru similarity index 100% rename from amapcontract/productors/folder.bru rename to bruno/productors/folder.bru diff --git a/amapcontract/products/Create.bru b/bruno/products/Create.bru similarity index 100% rename from amapcontract/products/Create.bru rename to bruno/products/Create.bru diff --git a/amapcontract/products/Delete one.bru b/bruno/products/Delete one.bru similarity index 100% rename from amapcontract/products/Delete one.bru rename to bruno/products/Delete one.bru diff --git a/amapcontract/products/Get all.bru b/bruno/products/Get all.bru similarity index 100% rename from amapcontract/products/Get all.bru rename to bruno/products/Get all.bru diff --git a/amapcontract/products/Get one.bru b/bruno/products/Get one.bru similarity index 100% rename from amapcontract/products/Get one.bru rename to bruno/products/Get one.bru diff --git a/amapcontract/products/Update one.bru b/bruno/products/Update one.bru similarity index 100% rename from amapcontract/products/Update one.bru rename to bruno/products/Update one.bru diff --git a/amapcontract/products/folder.bru b/bruno/products/folder.bru similarity index 100% rename from amapcontract/products/folder.bru rename to bruno/products/folder.bru diff --git a/amapcontract/shipments/Create.bru b/bruno/shipments/Create.bru similarity index 100% rename from amapcontract/shipments/Create.bru rename to bruno/shipments/Create.bru diff --git a/amapcontract/shipments/Delete one.bru b/bruno/shipments/Delete one.bru similarity index 100% rename from amapcontract/shipments/Delete one.bru rename to bruno/shipments/Delete one.bru diff --git a/amapcontract/shipments/Get all.bru b/bruno/shipments/Get all.bru similarity index 100% rename from amapcontract/shipments/Get all.bru rename to bruno/shipments/Get all.bru diff --git a/amapcontract/shipments/Get one.bru b/bruno/shipments/Get one.bru similarity index 100% rename from amapcontract/shipments/Get one.bru rename to bruno/shipments/Get one.bru diff --git a/amapcontract/shipments/Update one.bru b/bruno/shipments/Update one.bru similarity index 100% rename from amapcontract/shipments/Update one.bru rename to bruno/shipments/Update one.bru diff --git a/amapcontract/shipments/folder.bru b/bruno/shipments/folder.bru similarity index 100% rename from amapcontract/shipments/folder.bru rename to bruno/shipments/folder.bru diff --git a/amapcontract/users/Create.bru b/bruno/users/Create.bru similarity index 100% rename from amapcontract/users/Create.bru rename to bruno/users/Create.bru diff --git a/amapcontract/users/Delete one.bru b/bruno/users/Delete one.bru similarity index 100% rename from amapcontract/users/Delete one.bru rename to bruno/users/Delete one.bru diff --git a/amapcontract/users/Get all.bru b/bruno/users/Get all.bru similarity index 100% rename from amapcontract/users/Get all.bru rename to bruno/users/Get all.bru diff --git a/amapcontract/users/Get one.bru b/bruno/users/Get one.bru similarity index 100% rename from amapcontract/users/Get one.bru rename to bruno/users/Get one.bru diff --git a/amapcontract/users/Update one.bru b/bruno/users/Update one.bru similarity index 100% rename from amapcontract/users/Update one.bru rename to bruno/users/Update one.bru diff --git a/amapcontract/users/folder.bru b/bruno/users/folder.bru similarity index 100% rename from amapcontract/users/folder.bru rename to bruno/users/folder.bru diff --git a/docker-compose.dev.yaml b/docker-compose.dev.yaml new file mode 100644 index 0000000..5ff3599 --- /dev/null +++ b/docker-compose.dev.yaml @@ -0,0 +1,55 @@ +services: + frontend: + build: + context: . + dockerfile: frontend/Dockerfile.dev + volumes: + - ./frontend:/app + - /app/node_modules + environment: + VITE_API_URL: ${VITE_API_URL} + ports: + - "5173:5173" + depends_on: + - backend + backend: + build: + context: . + dockerfile: backend/Dockerfile + volumes: + - ./backend:/code/app + command: > + sh -c "fastapi run app/src/main.py --reload --port 8000" + environment: + ORIGINS: ${ORIGINS} + DB_HOST: database + DB_USER: ${DB_USER} + DB_PASS: ${DB_PASS} + DB_NAME: ${DB_NAME} + SECRET_KEY: ${SECRET_KEY} + KEYCLOAK_SERVER: ${KEYCLOAK_SERVER} + KEYCLOAK_REALM: ${KEYCLOAK_REALM} + KEYCLOAK_CLIENT_ID: ${KEYCLOAK_CLIENT_ID} + KEYCLOAK_CLIENT_SECRET: ${KEYCLOAK_CLIENT_SECRET} + KEYCLOAK_REDIRECT_URI: ${KEYCLOAK_REDIRECT_URI} + DEBUG: ${DEBUG} + MAX_AGE: ${MAX_AGE} + ports: + - "8000:8000" + depends_on: + - database + + database: + image: postgres + restart: always + shm_size: 128mb + volumes: + - db:/var/lib/postgresql + environment: + POSTGRES_USER: ${DB_USER} + POSTGRES_PASSWORD: ${DB_PASS} + POSTGRES_DB: ${DB_NAME} + ports: + - 5432:5432 +volumes: + db: \ No newline at end of file diff --git a/docker-compose.yaml b/docker-compose.yaml index 0ca4f3d..e75faba 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -9,8 +9,8 @@ services: ports: - 80:80 depends_on: - - back - back: + - backend + backend: build: context: . dockerfile: backend/Dockerfile @@ -22,7 +22,6 @@ services: DB_PASS: ${DB_PASS} DB_NAME: ${DB_NAME} SECRET_KEY: ${SECRET_KEY} - VITE_API_URL: ${VITE_API_URL} KEYCLOAK_SERVER: ${KEYCLOAK_SERVER} KEYCLOAK_REALM: ${KEYCLOAK_REALM} KEYCLOAK_CLIENT_ID: ${KEYCLOAK_CLIENT_ID} @@ -42,5 +41,7 @@ services: POSTGRES_USER: ${DB_USER} POSTGRES_PASSWORD: ${DB_PASS} POSTGRES_DB: ${DB_NAME} + ports: + - 5432:5432 volumes: db: \ No newline at end of file diff --git a/frontend/Dockerfile.dev b/frontend/Dockerfile.dev new file mode 100644 index 0000000..cc35bb2 --- /dev/null +++ b/frontend/Dockerfile.dev @@ -0,0 +1,12 @@ +FROM node:20 AS dev + +WORKDIR /app + +COPY frontend/package.json ./ +COPY frontend/package-lock.json ./ + +RUN npm install + +COPY frontend . + +CMD ["npm", "run", "dev", "--", "--host"] \ No newline at end of file