Skip to content
Merged

Test #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
37c8a1a
Merge pull request #24 from DEPSEC-Project/test
aguacero7 Apr 2, 2025
e562b54
Delete migrations/versions/__pycache__/3598886c6764_v3_test.cpython-3…
aguacero7 Apr 2, 2025
c637edf
Merge pull request #25 from DEPSEC-Project/aguacero7-patch-4
aguacero7 Apr 2, 2025
be7e757
Update CHANGELOG.md
aguacero7 Apr 2, 2025
b01b7dc
Update README.md
aguacero7 Apr 2, 2025
503a6ee
Merge pull request #27 from DEPSEC-Project/aguacero7-patch-6
aguacero7 Apr 2, 2025
483adb1
Merge pull request #30 from DEPSEC-Project/test
aguacero7 Apr 2, 2025
3870902
Merge pull request #31 from DEPSEC-Project/development
aguacero7 Apr 2, 2025
636b06d
Merge pull request #32 from DEPSEC-Project/test
aguacero7 Apr 2, 2025
9a38dce
Merge pull request #33 from DEPSEC-Project/development
aguacero7 Apr 2, 2025
b081bb5
Merge pull request #34 from DEPSEC-Project/development
aguacero7 Apr 2, 2025
55f6e67
Merge pull request #35 from DEPSEC-Project/test
aguacero7 Apr 2, 2025
64b3920
Update README.md
aguacero7 Apr 2, 2025
7c9375e
0.6.0
Apr 2, 2025
6ded90b
Merge pull request #38 from DEPSEC-Project/development
BabtouZER Apr 2, 2025
d88d769
Merge pull request #37 from DEPSEC-Project/development
BabtouZER Apr 2, 2025
35a2a91
0.7.0
Apr 2, 2025
b9061a3
Merge pull request #39 from DEPSEC-Project/development
BabtouZER Apr 2, 2025
27845c6
Merge pull request #40 from DEPSEC-Project/test
BabtouZER Apr 2, 2025
e39251f
0.7.1
Apr 2, 2025
32e14e6
Merge pull request #41 from DEPSEC-Project/development
BabtouZER Apr 2, 2025
de71e0b
Merge pull request #42 from DEPSEC-Project/test
BabtouZER Apr 2, 2025
05092ba
0.8.0
Apr 2, 2025
cac84fd
Merge pull request #43 from DEPSEC-Project/development
BabtouZER Apr 2, 2025
b2d165e
Merge pull request #44 from DEPSEC-Project/test
BabtouZER Apr 2, 2025
0357a01
0.9.0
Apr 2, 2025
506abe4
Update setup.py
aguacero7 Apr 2, 2025
9acb8d2
Update .releaserc.toml
aguacero7 Apr 2, 2025
9723644
Merge pull request #45 from DEPSEC-Project/development
aguacero7 Apr 2, 2025
cbe109c
Merge pull request #46 from DEPSEC-Project/test
aguacero7 Apr 2, 2025
40e7098
0.10.0
Apr 2, 2025
83f5f04
Merge pull request #47 from DEPSEC-Project/development
aguacero7 Apr 2, 2025
72adc85
Merge pull request #48 from DEPSEC-Project/test
aguacero7 Apr 2, 2025
3c16eab
0.10.1
Apr 2, 2025
ce24684
Merge pull request #49 from DEPSEC-Project/development
aguacero7 Apr 2, 2025
85072f6
Merge pull request #50 from DEPSEC-Project/test
aguacero7 Apr 2, 2025
602cf99
0.10.2
Apr 2, 2025
fe903a1
Update models.py
BabtouZER Apr 3, 2025
2c62da9
Update models.py
BabtouZER Apr 3, 2025
3eb4400
Update models.py
BabtouZER Apr 3, 2025
ded1274
Merge pull request #26 from DEPSEC-Project/aguacero7-patch-5
BabtouZER Apr 3, 2025
c8f2aa3
Update models.py
BabtouZER Apr 3, 2025
0a798ec
Update models.py
BabtouZER Apr 3, 2025
3284723
Update models.py
BabtouZER Apr 3, 2025
c39eabd
Merge pull request #51 from DEPSEC-Project/main
BabtouZER Apr 3, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .releaserc.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
[tool.semantic_release]
branch = "main"
version_source = "variable"
version_variable = "setup.py:__version__"
commit_message = "chore(release): create new version {version}"
github_token = "${GH_TOKEN}"
github_token = "${GH_TOKEN}"
155 changes: 154 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,159 @@
# CHANGELOG


## v0.10.2 (2025-04-02)

### Bug Fixes

- Modification de la CI pour les upgrades
([`ab23312`](https://github.com/DEPSEC-Project/DB-Management/commit/ab23312e0df5d49b1b3ef6f0c312bd4d7d472f2a))


## v0.10.1 (2025-04-02)

### Bug Fixes

- Migration sbom id peut etre null
([`0c64b3d`](https://github.com/DEPSEC-Project/DB-Management/commit/0c64b3d4000b49df7fa8e0933ac4a15a5be9297a))


## v0.10.0 (2025-04-02)

### Features

- **ci**: Modif des migrations selon la branche
([`02499e4`](https://github.com/DEPSEC-Project/DB-Management/commit/02499e4daacfffb94c571b610c780a53c38ed5bf))


## v0.9.0 (2025-04-02)

### Bug Fixes

- **error**: Missing-function-docstring
([`6a92a2e`](https://github.com/DEPSEC-Project/DB-Management/commit/6a92a2e2809acce58d3bf4b51f5dc434c66780fb))

### Features

- **create_function**: Cette fonction permet de retourner tous les projets
([`e9b37f7`](https://github.com/DEPSEC-Project/DB-Management/commit/e9b37f7a1faead253f0486572349dd5362f322bb))


## v0.8.0 (2025-04-02)

### Features

- **trivyreport**: Ajout d'une clé étrangère pour id_sbom de trivyreport avec la table SBOM
([`34ca141`](https://github.com/DEPSEC-Project/DB-Management/commit/34ca141e5d3bc183aa4e96e59832d87c566318fd))


## v0.7.1 (2025-04-02)

### Bug Fixes

- **name_class**: Des trucs
([`64b78a8`](https://github.com/DEPSEC-Project/DB-Management/commit/64b78a80f673e148acbd0dc223d8428f09a2be53))


## v0.7.0 (2025-04-02)

### Bug Fixes

- **bdd**: Pb et tout quoi des choses
([`39509bb`](https://github.com/DEPSEC-Project/DB-Management/commit/39509bb0d9467c3eeb276771c63470707789aa79))

- **bdd**: Ya un truc qui marchait pas du coup et voila
([`943eeba`](https://github.com/DEPSEC-Project/DB-Management/commit/943eeba872894d19ca88246ea32a98a1a87ea3bd))

### Features

- **model**: Ajout du modele des projets
([`7533b8a`](https://github.com/DEPSEC-Project/DB-Management/commit/7533b8a448b19c279ede6a222cc66b8e0fab79c7))


## v0.6.0 (2025-04-02)

### Bug Fixes

- Fix du problème pylint louche
([`6ad0b7c`](https://github.com/DEPSEC-Project/DB-Management/commit/6ad0b7c75162d08ed22960479d19413ccc838ddd))

- La j'ai 10/10
([`c232f4d`](https://github.com/DEPSEC-Project/DB-Management/commit/c232f4d36d2486f9e93c093a5f9dcdd88dc7e2b8))

- Longueur de la ligne
([`94c0c88`](https://github.com/DEPSEC-Project/DB-Management/commit/94c0c887d04971ab3ab03d5b08e3243564258088))

- Maj des fichiers workflow dev.yml et master.yml
([`041bfa4`](https://github.com/DEPSEC-Project/DB-Management/commit/041bfa4b6d9da2f7205525849551222e190afa42))

- Model TrivyReport contenait une variable deja utilisée
([`029c2bd`](https://github.com/DEPSEC-Project/DB-Management/commit/029c2bd4e111f038a34b7163f4777fdfd1ef2ad6))

- Models
([`7445bcc`](https://github.com/DEPSEC-Project/DB-Management/commit/7445bccd9c89a86b5d43243a6f52f40ec228ef89))

- Not callable
([`e5ba63f`](https://github.com/DEPSEC-Project/DB-Management/commit/e5ba63ff72b83dca2a9fa8ec3f8d095f7cd9b683))

- Not callable (bug pylint)
([`9d785d1`](https://github.com/DEPSEC-Project/DB-Management/commit/9d785d17ff18f4f093cd83a7a4702db77e6d0af7))

- Pour avoir 10/10 avec pylint
([`31536e2`](https://github.com/DEPSEC-Project/DB-Management/commit/31536e2a8a1787e0221fc54f33c25922fd53fab9))

- Pylint
([`0f36fad`](https://github.com/DEPSEC-Project/DB-Management/commit/0f36fad9ddac40d9c222528b94d102e1a25e296e))

### Features

- Ajout du model du rapport Trivy
([`5e449dd`](https://github.com/DEPSEC-Project/DB-Management/commit/5e449ddc5c0ca9dbf4a136287fccf17d07ca9441))

- **auth**: Ajout des modèles d'user / blacklistToken
([`1d2fc7f`](https://github.com/DEPSEC-Project/DB-Management/commit/1d2fc7f660163ba8fbf699f0c228474cdeafc22c))

### Testing

- Migration BDD
([`59c06c0`](https://github.com/DEPSEC-Project/DB-Management/commit/59c06c0a93f3075995fbf97dba2219fd16281a1b))

- Migration BDD
([`1abe6df`](https://github.com/DEPSEC-Project/DB-Management/commit/1abe6df06ff73240e37eb5f7bc7630661b209e85))

- Migration BDD
([`1e1002b`](https://github.com/DEPSEC-Project/DB-Management/commit/1e1002b33b264f9d601ce357ea74f9853d6424a7))

- Migration BDD
([`c3cb0e9`](https://github.com/DEPSEC-Project/DB-Management/commit/c3cb0e9519c8af03b278d96429e79c132fc238e1))

- Migration BDD
([`f6ea447`](https://github.com/DEPSEC-Project/DB-Management/commit/f6ea447670b4c68b4408adaeec66a3fbf44222c3))

- Migration BDD
([`e577de7`](https://github.com/DEPSEC-Project/DB-Management/commit/e577de7c4fcb88bb1eb813e44608ad6bf974b5db))

- Migration de la BDD
([`feabc6d`](https://github.com/DEPSEC-Project/DB-Management/commit/feabc6d2d027a66ae4324d3028bf2091cdca3080))

- Migration de la bdd sur le serveur portainer
([`10a3842`](https://github.com/DEPSEC-Project/DB-Management/commit/10a3842fbe210bdf78e01575084db2acf9a95b58))

- Migration de la BDD test n°2
([`759f62e`](https://github.com/DEPSEC-Project/DB-Management/commit/759f62ef85b38708804e75e99ffc73e3df5ac915))

- Migration de la BDD test n°3
([`e8ee1c4`](https://github.com/DEPSEC-Project/DB-Management/commit/e8ee1c452aebf885a973da0e307a05f6c76e0f87))

- Migration de la BDD vers le serveur portainer
([`26ef818`](https://github.com/DEPSEC-Project/DB-Management/commit/26ef8186c37f98247d303876e5cdf875e516ea2b))

- Réparation semantic-release
([`b9b5bca`](https://github.com/DEPSEC-Project/DB-Management/commit/b9b5bca5911d0c0d18d88e0eca5316074b11d438))

- Test de la migratiuon de la BDD sur le serveur portainer
([`0f27967`](https://github.com/DEPSEC-Project/DB-Management/commit/0f27967f1c41264570393f52dc45534e052f1fcc))


## v0.5.0 (2025-03-24)

### Bug Fixes
Expand All @@ -9,7 +162,7 @@
([`4894e16`](https://github.com/DEPSEC-Project/DB-Management/commit/4894e16261b1dbd74614ee9a92a378bedc227d1d))

- **ci**: Désactivation des warnings dans pylint
([`f66ccc5`](https://github.com/DEPSEC-Project/DB-Management/commit/f66ccc5f1fbfb3f46a61d2526594430ec79649d9))
([`f66ccc5`](https://github.com/DEPSEC-Project/DB-Management/commit/f66ccc5f1fbfb3f46a61d2526594430ec79649d9))

- **ci**: Modification de master.yml
([`fee2131`](https://github.com/DEPSEC-Project/DB-Management/commit/fee213137cc5e643cc8d9f92940f3393bc51b880))
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ Objectifs:
- Permettre l'importation de ces modèles pour les microservices

Package gérant la mise à jour de la BDD ainsi que tous les modèles.
ca
Pour récupérer le package (et pour ainsi dire les modèles):
c
Pour récupérer le package (et pour ainsi dire les modèles):
```bash
pip install --no-cache-dir --index-url https://pypi.org/simple git+https://github.com/DEPSEC-Project/DB-Management.git
```
Expand Down
13 changes: 11 additions & 2 deletions depsec_db/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,14 @@
"""

import uuid

from sqlalchemy import (
ForeignKey,
func as sa_func
)
from sqlalchemy.orm import relationship
from werkzeug.security import generate_password_hash, check_password_hash
from sqlalchemy import func as sa_func

from depsec_db.extensions import db

class Project(db.Model):
Expand All @@ -18,6 +24,8 @@ class Project(db.Model):
titre = db.Column(db.String, nullable=False)
status = db.Column(db.String, nullable=False)
path = db.Column(db.String, nullable=False)
"""Relation avec SBOM : suppression en cascade"""
sboms = relationship("SBOM", backref="project", cascade="all, delete", passive_deletes=True)
def to_dict(self):
"""Function to return projects as JSON"""
return {
Expand Down Expand Up @@ -109,7 +117,8 @@ class SBOM(db.Model):
"""
__tablename__ = 'sboms'
id = db.Column(db.Integer, primary_key=True, autoincrement=True)
project_id = db.Column(db.Integer, db.ForeignKey('projects.id'), nullable=False)
"""Clé étrangère vers l'id du projet"""
project_id = db.Column(db.Integer, ForeignKey('projects.id',ondelete="CASCADE"),nullable=False)
sbom_data = db.Column(db.JSON, nullable=False)
"""Relation One-To-Many avec la table TrivyReport qui utilise l'id du SBOM"""
projects = db.relationship('TrivyReport', backref='sboms', lazy=True)
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"""
from setuptools import find_packages, setup

__version__ ="0.5.0"
__version__ ="0.9.0"
setup(
name="depsec_models",
version=__version__,
Expand Down