Merge branch 'master' into multi-tenant

back/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.10
+FROM python:3.13
 
 RUN apt update && apt install -y xfonts-base xfonts-75dpi python3-pip python3-cffi python3-brotli libpango-1.0-0 libpangoft2-1.0-0 \
     && rm -rf /var/lib/apt/lists/*

back/app/contract/models.py

@@ -1,5 +1,5 @@
 import datetime
-from typing import List, Literal
+from typing import List, Literal, Optional
 from enum import Enum
 
 from pydantic import BaseModel, Field, validator
@@ -52,10 +52,10 @@ class DraftParty(BaseModel):
 class Party(BaseModel):
     entity: Entity
     part: str
-    representative: Entity = None
+    representative: Optional[Entity] = None
     signature_uuid: str
     signature_affixed: bool = False
-    signature_png: str = None
+    signature_png: Optional[str] = None
 
 
 class ProvisionGenuine(BaseModel):
@@ -181,7 +181,7 @@ class Contract(CrudDocument):
     lawyer: Entity = Field(title="Avocat en charge")
     location: str = Field(title="Lieu")
     date: datetime.date = Field(title="Date")
-    label: str = None
+    label: Optional[str] = None
 
     @validator("label", always=True)
     def generate_label(cls, v, values, **kwargs):
@@ -190,7 +190,7 @@ class Contract(CrudDocument):
             for p in values['parties']:
                 contract_label = contract_label + f" - {p.entity.label}"
 
-            contract_label = contract_label + f" {values['date'].strftime('%m/%d/%Y')}"
+            contract_label = contract_label + f" - {values['date'].strftime('%m/%d/%Y')}"
             return contract_label
 
         return v

back/app/contract/print/__init__.py

@@ -130,7 +130,7 @@ async def create_pdf(contract_id: str) -> str:
     return FileResponse(
         contract_path,
         media_type="application/pdf",
-        filename=contract.name)
+        filename=contract.label)
 
 
 def retrieve_signature_png(filepath):

back/app/contract/print/templates/styles.css

@@ -109,6 +109,11 @@ h2 {
     text-indent: 2em;
 }
 
+.content td p {
+    text-indent: 0;
+    text-align: left;
+}
+
 .provision {
     page-break-inside: avoid;
 }
@@ -117,13 +122,17 @@ p {
     text-align: justify;
 }
 
+li {
+    margin: 16px 0;
+}
+
 .footer {
     margin-top: 30px;
     page-break-inside: avoid;
 }
 
 .mention {
-    margin: 0px;
+    margin: 0;
     font-size: 0.9em;
 }
 

back/app/core/routes.py

@@ -3,10 +3,10 @@ from beanie.odm.operators.find.comparison import In
 from beanie.operators import And, RegEx, Eq
 
 from fastapi import APIRouter, HTTPException, Depends
-from fastapi_paginate import Page, Params, add_pagination
+from fastapi_pagination import Page, Params, add_pagination
-from fastapi_paginate.ext.motor import paginate
+from fastapi_pagination.ext.beanie import paginate
 
-from ..user.manager import get_current_user, get_current_superuser
+from ..user.manager import get_current_user, get_current_superuser, get_current_user_and_firm
 
 
 def parse_sort(sort_by):
@@ -63,28 +63,27 @@ def get_crud_router(model, model_create, model_read, model_update):
     router = APIRouter()
 
     @router.post("/", response_description="{} added to the database".format(model.__name__))
-    async def create(item: model_create, user=Depends(get_current_user)) -> dict:
+    async def create(instance: str, firm: str, item: model_create, user=Depends(get_current_user)) -> dict:
         await item.validate_foreign_key()
         o = await model(**item.dict()).create()
         return {"message": "{} added successfully".format(model.__name__), "id": o.id}
 
     @router.get("/{id}", response_description="{} record retrieved".format(model.__name__))
-    async def read_id(id: PydanticObjectId, user=Depends(get_current_user)) -> model_read:
+    async def read_id(instance: str, firm: str, id: PydanticObjectId, user=Depends(get_current_user)) -> model_read:
         item = await model.get(id)
         return model_read(**item.dict())
 
     @router.get("/", response_model=Page[model_read], response_description="{} records retrieved".format(model.__name__))
-    async def read_list(size: int = 50, page: int = 1, sort_by: str = None, query: str = None,
+    async def read_list(instance: str, firm: str, size: int = 50, page: int = 1, sort_by: str = None, query: str = None,
-                        user=Depends(get_current_user)) -> Page[model_read]:
+                        user=Depends(get_current_user_and_firm)) -> Page[model_read]:
         sort = parse_sort(sort_by)
         query = parse_query(query, model_read)
 
-        collection = model.get_motor_collection()
+        items = paginate(model.find(query), Params(**{'size': size, 'page': page}))
-        items = paginate(collection, query, Params(**{'size': size, 'page': page}), sort=sort)
         return await items
 
     @router.put("/{id}", response_description="{} record updated".format(model.__name__))
-    async def update(id: PydanticObjectId, req: model_update, user=Depends(get_current_user)) -> model_read:
+    async def update(instance: str, firm: str, id: PydanticObjectId, req: model_update, user=Depends(get_current_user)) -> model_read:
         req = {k: v for k, v in req.dict().items() if v is not None}
         update_query = {"$set": {
             field: value for field, value in req.items()
@@ -101,7 +100,7 @@ def get_crud_router(model, model_create, model_read, model_update):
         return model_read(**item.dict())
 
     @router.delete("/{id}", response_description="{} record deleted from the database".format(model.__name__))
-    async def delete(id: PydanticObjectId, user=Depends(get_current_superuser)) -> dict:
+    async def delete(instance: str, firm: str, id: PydanticObjectId, user=Depends(get_current_superuser)) -> dict:
         item = await model.get(id)
 
         if not item:

back/app/db.py

@@ -6,7 +6,6 @@ from .user import User, AccessToken
 from .entity.models import Entity
 from .template.models import ContractTemplate, ProvisionTemplate
 from .contract.models import ContractDraft, Contract
-# from .order.models import Order
 
 DB_PASSWORD = "IBO3eber0mdw2R9pnInLdtFykQFY2f06"
 DATABASE_URL = f"mongodb://root:{DB_PASSWORD}@mongo:27017/"

back/app/entity/models.py

@@ -23,8 +23,8 @@ class Individual(EntityType):
         props={"items-per-row": "4", "numbered": True},
         title="Surnoms"
     )
-    day_of_birth: date = Field(default=None, title='Date de naissance')
+    day_of_birth: Optional[date] = Field(default=None, title='Date de naissance')
-    place_of_birth: str = Field(default="", title='Lieu de naissance')
+    place_of_birth: Optional[str] = Field(default="", title='Lieu de naissance')
 
     @property
     def label(self) -> str:

back/app/main.py

@@ -17,10 +17,12 @@ async def on_startup():
 
 app.include_router(get_auth_router(), prefix="/auth", tags=["auth"], )
 app.include_router(user_router, prefix="/users", tags=["users"], )
-app.include_router(entity_router, prefix="/entity", tags=["entity"], )
+
-app.include_router(template_router, prefix="/template", tags=["template"], )
+multitenant_prefix = "/{instance}/{firm}"
-app.include_router(contract_router, prefix="/contract", tags=["contract"], )
+
-# app.include_router(order_router, prefix="/order", tags=["order"], )
+app.include_router(entity_router, prefix=f"{multitenant_prefix}/entity", tags=["entity"], )
+app.include_router(template_router, prefix=f"{multitenant_prefix}/template", tags=["template"], )
+app.include_router(contract_router, prefix=f"{multitenant_prefix}/contract", tags=["contract"], )
 
 if __name__ == '__main__':
     import uvicorn

back/app/user/manager.py

@@ -109,6 +109,9 @@ fastapi_users = FastAPIUsers[User, uuid.UUID](
 get_current_user = fastapi_users.current_user(active=True)
 get_current_superuser = fastapi_users.current_user(active=True, superuser=True)
 
+def get_current_user_and_firm(user=Depends(get_current_user)):
+    return user
+
 
 def get_auth_router():
     return fastapi_users.get_auth_router(auth_backend)

back/app/user/models.py

@@ -1,7 +1,7 @@
 from typing import Optional, TypeVar
 from datetime import datetime
 from pydantic import Field
-from beanie import PydanticObjectId
+from beanie import Document
 
 from fastapi_users.db import BeanieBaseUser, BeanieUserDatabase
 from fastapi_users_db_beanie.access_token import BeanieAccessTokenDatabase, BeanieBaseAccessToken
@@ -9,11 +9,11 @@ from fastapi_users_db_beanie.access_token import BeanieAccessTokenDatabase, Bean
 from pymongo import IndexModel
 
 
-class AccessToken(BeanieBaseAccessToken[PydanticObjectId]):
+class AccessToken(BeanieBaseAccessToken, Document):
     pass
 
 
-class User(BeanieBaseUser[PydanticObjectId]):
+class User(BeanieBaseUser, Document):
     login: str
     entity_id: str
     created_at: datetime = Field(default=datetime.utcnow(), nullable=False)

back/app/user/schemas.py

@@ -1,4 +1,6 @@
-from pydantic import BaseModel
+from typing import Annotated
+
+from pydantic import BaseModel, Field
 from fastapi_users import schemas
 
 from .models import User
@@ -9,12 +11,8 @@ class UserBase(schemas.CreateUpdateDictModel):
 
 
 class UserRead(User):
-    class Config:
+    _id: Annotated[str, Field(alias='id')]
-        fields = {
+    hashed_password:  Annotated[str, Field(exclude=True)]
-            '_id': {'alias': 'id'},
-            'hashed_password': {'exclude': True}
-        }
-
 
 class UserCreate(UserBase):
     login: str

back/requirements.txt

@@ -1,8 +1,7 @@
-fastapi==0.88.0
+fastapi
-fastapi_users==10.2.1
+fastapi_users
-fastapi_users_db_beanie==1.1.2
+fastapi_users_db_beanie
-motor==3.1.1
+fastapi-pagination
-fastapi-paginate==0.1.0
 uvicorn
 jinja2
 weasyprint

docker-compose.yml

@@ -1,4 +1,3 @@
-version: "3.9"
 services:
   back:
     build:
@@ -10,6 +9,11 @@ services:
     volumes:
       - ./back/app:/code/app
       - ./back/media:/code/media
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.back.entrypoints=web"
+      - "traefik.http.routers.back.rule=PathPrefix(`/api/v1/`)"
+      - "traefik.http.services.back.loadbalancer.server.port=8000"
 
   front:
     build:
@@ -21,12 +25,23 @@ services:
     volumes:
       - ./front/app/src:/app/src
       - ./front/app/public:/app/public
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.front.entrypoints=web"
+      - "traefik.http.routers.front.rule=PathPrefix(`/`)"
+      - "traefik.http.services.front.loadbalancer.server.port=4200"
 
-  nginx:
+  proxy:
-    build:
+    image: traefik
-      context: ./nginx
-    image: cht-lawfirm-nginx-dev
     restart: always
+    command:
+      - --providers.docker
+      - --providers.docker.watch=true
+      - --providers.docker.exposedByDefault=false
+      - --entrypoints.web.address=:80
+      - --log.level=DEBUG
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
     ports:
       - "80:80"
 

front/app/src/app/views/contracts/contracts.component.ts

@@ -78,23 +78,12 @@ export class ContractsCardComponent extends BaseContractsComponent{
 
 @Component({
     template: `
-        <ngb-accordion #acc="ngbAccordion" activeIds="ngb-panel-1">
+        <div>
-            <ngb-panel>
-                <ng-template ngbPanelTitle>
-                    <span i18n>Preview</span>
-                </ng-template>
-                <ng-template ngbPanelContent>
             <iframe width="100%" 
                     [src]="getPreview()" 
-                            onload='javascript:(function(o){o.style.height=o.contentWindow.document.body.scrollHeight+"px";o.style.width=o.contentWindow.document.body.scrollWidth+"px";}(this));' style="height:200px;width:100%;border:none;overflow:hidden;"></iframe>
+                    onload='javascript:(function(o){o.style.height=o.contentWindow.document.body.scrollHeight+"px";o.style.width=o.contentWindow.document.body.scrollWidth+"px";}(this));' style="height:200px;width:100%;border:none;overflow:hidden;">
-                </ng-template>
+            </iframe>
-            </ngb-panel>
+        </div>
-            <ngb-panel>
-                <ng-template ngbPanelTitle>
-                    <span i18n>Signature</span>
-                </ng-template>
-                <ng-template ngbPanelContent>
-                    <ng-container *ngIf="this.affixed"><ng-container i18n>This Contract has already been signed by</ng-container> {{ this.signatory }}</ng-container>
         <div class="row" *ngIf="!this.affixed">
             <signature-drawer class="col-7"
              (signatureDrawn$)="postSignature($event)"></signature-drawer>
@@ -104,11 +93,7 @@ export class ContractsCardComponent extends BaseContractsComponent{
                 <p>En vous maintenant et/ou en interagissant avec cette page, vous enfreignez l'article L.229 du code pénal de l'Etat de San Andreas pour <strong>usurpation d'identité</strong> et vous vous exposez ainsi à une amende de 20 000$ ainsi qu'à des poursuites civiles.</p>
                 <p>Le cabinet Cooper, Hillman & Toshi LLC</p>
             </div>
-                    </div>
+        </div>`
-                </ng-template>
-            </ngb-panel>
-        </ngb-accordion>
-    `
 })
 export class ContractsSignatureComponent implements OnInit {
     signature_id: string | null = null;

front/app/src/common/crud/list/list.component.html

@@ -21,7 +21,6 @@
 					(filterChange)="onFilterChange($event)"
 			></crud-list-filter-list>
 		</div>
-		<span class="col col-form-label" i18n *ngIf="loading$ | async">Loading...</span>
 	</div>
 	<div class="table-responsive-md">
 		<table class="table table-striped table-hover">
@@ -31,6 +30,9 @@
 				</tr>
 			</thead>
 			<tbody>
+				<tr *ngIf="loading$ | async">
+					<td class="text-center" [attr.colspan]="this.displayedColumns.length" i18n>Loading...</td>
+				</tr>
 				<tr *ngFor="let row of listData$ | async" (click)="onRowClick(row._id)" (auxclick)="onRowMiddleClick(row._id);" class="table-row-link">
 					<td class="text-truncate" *ngFor="let col of this.displayedColumns"  style="max-width: 150px;">
 						<ngb-highlight [result]="getColumnValue(row, col.path)" [term]="searchTerm"></ngb-highlight>
@@ -40,7 +42,7 @@
 		</table>
 	</div>
 
-	<div class="d-flex justify-content-between p-2">
+	<div class="d-flex justify-content-between p-2" *ngIf="! (loading$ | async)" >
 		<ngb-pagination [collectionSize]="(total$ | async)!" [(page)]="page" [pageSize]="pageSize">
 		</ngb-pagination>
 

front/app/src/common/crud/list/list.component.ts

@@ -68,7 +68,6 @@ export class ListComponent implements OnInit {
             if (parsedParams.hasOwnProperty('searchFilters')) {
                 parsedParams['searchFilters'] = JSON.parse(parsedParams['searchFilters']);
             }
-            this._total$.next(this.page * this.pageSize);
             this._set(parsedParams)
         });
     }

front/app/src/common/crud/types/array.type.ts

@@ -4,12 +4,17 @@ import { FieldArrayType } from '@ngx-formly/core';
 @Component({
     selector: 'formly-array-type',
     template: `
-    <div>
+        <div class="mb-3">
+            <ngb-accordion #acc="ngbAccordion" activeIds="ngb-panel-0">
+                <ngb-panel id="ngb-panel-0">
+                    <ng-template ngbPanelTitle>
                         <label *ngIf="props.label" class="form-label">{{ props.label }}</label>
                         <p *ngIf="props.description">{{ props.description }}</p>
                         <div class="alert alert-danger" role="alert" *ngIf="showError && formControl.errors">
                             <formly-validation-message [field]="field"></formly-validation-message>
                         </div>
+                    </ng-template>
+                    <ng-template ngbPanelContent>
                         <div class="row row-cols-1 row-cols-md-{{this.itemsPerRow}} g-1">
                             <div *ngFor="let entry of field.fieldGroup; let i = index" class="col">
                                 <div class="card">
@@ -29,7 +34,10 @@ import { FieldArrayType } from '@ngx-formly/core';
                                 </div>
                             </div>
                         </div>
-        <button *ngIf="! this.field.props.readonly" class="btn btn-success col-sm-12" type="button" (click)="add()"><i-bs name="plus-square-fill"></i-bs></button>
+                        <button *ngIf="! this.field.props.readonly" class="btn btn-success col-sm-12 gap-3" type="button" (click)="add()"><i-bs name="plus-square-fill"></i-bs></button>
+                    </ng-template>
+                </ngb-panel>
+            </ngb-accordion>
         </div>
     `,
 })

front/app/src/common/crud/types/dictionary.type.ts

@@ -10,7 +10,7 @@ import {FormlyJsonschema} from "@ngx-formly/core/json-schema";
     template: `
         <div class="mb-3">
             <ngb-accordion #acc="ngbAccordion" activeIds="ngb-panel-0">
-                <ngb-panel>
+                <ngb-panel id="ngb-panel-0">
                     <ng-template ngbPanelTitle>
                         <label *ngIf="props.label && props['hideLabel'] !== true" [attr.for]="id"
                                class="form-label">{{ props.label }}

front/app/src/index.html

@@ -2,10 +2,13 @@
 <html lang="en">
 <head>
   <meta charset="utf-8">
-  <title>App</title>
+  <title>Cooper, Hillman & Toshi</title>
   <base href="/">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="icon" type="image/x-icon" href="favicon.ico">
+  <meta property="og:title" content="Cooper, Hillman & Toshi">
+  <meta property="og:description" content="Interface d'administration des contrats">
+  <meta property="og:image" content="/assets/logo.png">
 </head>
 <body>
   <app-root></app-root>

front/app/src/styles.css

@@ -36,4 +36,5 @@
 
 .nav-link.active {
     border: #D2BA6F solid 2px;
+    border-radius: 0;
 }