Compare commits
36 Commits
473212c2e6
...
feat/37-fs
Author | SHA1 | Date | |
---|---|---|---|
2ad6dba535
|
|||
db5eedd45a
|
|||
e01b28f66f
|
|||
51bed2b4f4
|
|||
76d9e4e4f0
|
|||
0b5b4978a6
|
|||
8fe733fc30
|
|||
71f9d0c5f8
|
|||
0ef8ede764
|
|||
ae68de8a3c | |||
e24b9c7859 | |||
c83824ae34 | |||
1b94fefad3
|
|||
5f7229c307
|
|||
d043915a29
|
|||
2260b0cfa8
|
|||
203521fe01
|
|||
3c1e691cb8
|
|||
add40f32c5 | |||
d8b8ce9a77
|
|||
9997ee43f8
|
|||
4ab8a1de81
|
|||
d13f36c5e2
|
|||
922598415c | |||
5f20c4b893
|
|||
2ded18692d
|
|||
8700354ad2
|
|||
0aa0aebbad
|
|||
f3e2090e7f
|
|||
90e79c1fa4
|
|||
777b7f2425
|
|||
fcba21ef68
|
|||
0d51e3aa68
|
|||
d43ee1c28f
|
|||
2ef527fa64
|
|||
502dc6f77d
|
@ -1,2 +1,3 @@
|
|||||||
SESAM_FSV_VERSION=1.40.13
|
SESAM_FSV_VERSION=1.40.13
|
||||||
SESAM_INI_PATH=/etc/opt/santesocial/fsv/${SESAM_FSV_VERSION}/conf/sesam.ini
|
SESAM_INI_PATH=/etc/opt/santesocial/fsv/${SESAM_FSV_VERSION}/conf/sesam.ini
|
||||||
|
DATABASE_URL=sqlite://p4pillon.sqlite?mode=rwc
|
||||||
|
@ -1,2 +1,3 @@
|
|||||||
SESAM_FSV_VERSION=1.40.13
|
SESAM_FSV_VERSION=1.40.13
|
||||||
SESAM_INI_PATH=${ALLUSERSPROFILE}\\santesocial\\fsv\\${SESAM_FSV_VERSION}\\conf\\sesam.ini
|
SESAM_INI_PATH=${ALLUSERSPROFILE}\\santesocial\\fsv\\${SESAM_FSV_VERSION}\\conf\\sesam.ini
|
||||||
|
DATABASE_URL=sqlite://p4pillon.sqlite?mode=rwc
|
||||||
|
1
.gitattributes
vendored
Normal file
1
.gitattributes
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
Cargo.lock -merge linguist-generated=false
|
3
.gitignore
vendored
3
.gitignore
vendored
@ -23,3 +23,6 @@ target/
|
|||||||
|
|
||||||
# Ignore .env files
|
# Ignore .env files
|
||||||
.env
|
.env
|
||||||
|
|
||||||
|
# Development Database
|
||||||
|
*.sqlite
|
||||||
|
2423
Cargo.lock
2423
Cargo.lock
File diff suppressed because it is too large
Load Diff
12
Cargo.toml
12
Cargo.toml
@ -4,6 +4,18 @@ members = [
|
|||||||
"crates/backend",
|
"crates/backend",
|
||||||
"crates/desktop",
|
"crates/desktop",
|
||||||
"crates/sesam-vitale",
|
"crates/sesam-vitale",
|
||||||
|
"crates/fsv",
|
||||||
"crates/fsv-sys",
|
"crates/fsv-sys",
|
||||||
"crates/utils",
|
"crates/utils",
|
||||||
|
"migration",
|
||||||
|
"entity",
|
||||||
|
".",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[workspace.dependencies]
|
||||||
|
anyhow = "1.0"
|
||||||
|
dotenv = "0.15"
|
||||||
|
sea-orm-cli = "1.0.1"
|
||||||
|
sea-orm = "1.0.1"
|
||||||
|
serde = { version = "1.0.210", features = ["derive"] }
|
||||||
|
thiserror = "1.0"
|
||||||
|
62
README.md
62
README.md
@ -44,6 +44,24 @@ La CLI Tauri est nécessaire au lancement du client `desktop`. Elle peut être i
|
|||||||
cargo install tauri-cli --version "^2.0.0-rc"
|
cargo install tauri-cli --version "^2.0.0-rc"
|
||||||
```
|
```
|
||||||
|
|
||||||
|
#### SeaORM CLI
|
||||||
|
|
||||||
|
SeaORM est notre ORM. Le CLI SeaORM est nécessaire pour la génération des modèles de la base de données et des migrations associées. Elle peut être installée via Cargo :
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cargo install sea-orm-cli
|
||||||
|
```
|
||||||
|
|
||||||
|
L'applicatif va chercher les informations de connexion à la base de données dans la variable `DATABASE_URL` importée depuis les [fichiers de configuration](#fichiers-de-configuration).
|
||||||
|
|
||||||
|
```.env
|
||||||
|
DATABASE_URL=sqlite://p4pillon.sqlite?mode=rwc
|
||||||
|
```
|
||||||
|
|
||||||
|
Toutefois, l'usage de la CLI de SeaORM nécessite de renseigner les informations de connexion à la base de données dans un fichier `.env` situé à la racine du projet.
|
||||||
|
|
||||||
|
> Astuce : utilisé un lien symbolique pour éviter de dupliquer le fichier `.env`.
|
||||||
|
|
||||||
#### FSV-sys
|
#### FSV-sys
|
||||||
|
|
||||||
La crate `fsv-sys` nécessite la présence des librairies fournies par le package FSV et la CryptolibCPS. Les instructions d'installation sont disponibles dans le [README](crates/sesam-vitale/README.md) de la crate `fsv-sys`.
|
La crate `fsv-sys` nécessite la présence des librairies fournies par le package FSV et la CryptolibCPS. Les instructions d'installation sont disponibles dans le [README](crates/sesam-vitale/README.md) de la crate `fsv-sys`.
|
||||||
@ -58,7 +76,7 @@ Pour lancer l'application en mode développement, il est nécessaire d'exécuter
|
|||||||
|
|
||||||
```bash
|
```bash
|
||||||
# Lancement du serveur backend
|
# Lancement du serveur backend
|
||||||
systemfd --no-pid -s http::3030 -- cargo watch -x 'run --bin backend'
|
systemfd --no-pid -s http::8080 -- cargo watch -w crates/backend -x 'run --bin backend'
|
||||||
```
|
```
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
@ -66,7 +84,25 @@ systemfd --no-pid -s http::3030 -- cargo watch -x 'run --bin backend'
|
|||||||
# - frontend (serveur web, accessible via navigateur)
|
# - frontend (serveur web, accessible via navigateur)
|
||||||
bun run --cwd frontend/ dev
|
bun run --cwd frontend/ dev
|
||||||
# - desktop (client desktop, basé sur Tauri)
|
# - desktop (client desktop, basé sur Tauri)
|
||||||
cargo tauri dev
|
cargo tauri dev --no-watch
|
||||||
|
```
|
||||||
|
|
||||||
|
> Pour circonscrire les hot-reloads intempestifs mais peu utiles :
|
||||||
|
> - le `backend` n'est rechargé que si des modifications sont détectées dans le dossier précisé par `-w crates/backend`
|
||||||
|
> - le rechargement du `desktop` est désactivé par l'option `--no-watch` ; en effet, le rechargement du `frontend` est déjà pris en charge par `bun` et ne nécessite pas de rechargement du `desktop`
|
||||||
|
|
||||||
|
## Tests
|
||||||
|
|
||||||
|
Les tests unitaires et d'intégration utilisants des cartes CPS ou Vitale réelles sont désactivés par défaut et doivent être
|
||||||
|
[explicitement activés](https://doc.rust-lang.org/book/ch11-02-running-tests.html#ignoring-some-tests-unless-specifically-requested) pour s'exécuter.
|
||||||
|
|
||||||
|
### Snapshots
|
||||||
|
|
||||||
|
Pour certains modules, des tests d'intégration s'appuient sur la crate [`insta`](https://insta.rs) pour générer et comparer des snapshots.
|
||||||
|
Pour faciliter la gestion de ces tests, il est recommandé d'installer `cargo-insta` :
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cargo install cargo-insta
|
||||||
```
|
```
|
||||||
|
|
||||||
## Build
|
## Build
|
||||||
@ -76,3 +112,25 @@ Pour packager le client `desktop`, il est nécessaire de faire appel à la CLI T
|
|||||||
```bash
|
```bash
|
||||||
cargo tauri build
|
cargo tauri build
|
||||||
```
|
```
|
||||||
|
|
||||||
|
## Gestion de la base de données
|
||||||
|
|
||||||
|
### Création d'une migration
|
||||||
|
|
||||||
|
```bash
|
||||||
|
sea-orm-cli migrate generate <nom_de_la_migration>
|
||||||
|
```
|
||||||
|
|
||||||
|
Cette commande génère un fichier de migration à adapter dans le dossier `migration/src`.
|
||||||
|
|
||||||
|
### Appliquer les migrations
|
||||||
|
|
||||||
|
```bash
|
||||||
|
sea-orm-cli migrate up
|
||||||
|
```
|
||||||
|
|
||||||
|
### Génération des entitées
|
||||||
|
|
||||||
|
```bash
|
||||||
|
sea-orm-cli generate entity -o entity/src/entities --with-serde both
|
||||||
|
```
|
4
crates/app/.gitignore
vendored
4
crates/app/.gitignore
vendored
@ -1,4 +0,0 @@
|
|||||||
/target
|
|
||||||
|
|
||||||
# Tailwind CSS CLI
|
|
||||||
tailwindcss
|
|
@ -1,21 +0,0 @@
|
|||||||
[package]
|
|
||||||
name = "app"
|
|
||||||
version = "0.1.0"
|
|
||||||
edition = "2021"
|
|
||||||
|
|
||||||
[dependencies]
|
|
||||||
askama = "0.12.1"
|
|
||||||
askama_axum = "0.4.0"
|
|
||||||
axum = "0.7.5"
|
|
||||||
axum-htmx = { version = "0.6", features = ["auto-vary"] }
|
|
||||||
listenfd = "1.0.1"
|
|
||||||
notify = "6.1.1"
|
|
||||||
serde = { version = "1.0.204", features = ["derive"] }
|
|
||||||
thiserror = "1.0.63"
|
|
||||||
tokio = { version = "1.39.1", features = ["macros", "rt-multi-thread"] }
|
|
||||||
tower-http = { version = "0.5.2", features = ["fs"] }
|
|
||||||
tower-livereload = "0.9.3"
|
|
||||||
|
|
||||||
[dev-dependencies]
|
|
||||||
cargo-watch = "8.5.1"
|
|
||||||
systemfd = "0.4.0"
|
|
@ -1,35 +0,0 @@
|
|||||||
## Pré-requis
|
|
||||||
|
|
||||||
- Récupérer le binaire TailwindCSS : https://tailwindcss.com/blog/standalone-cli
|
|
||||||
|
|
||||||
## Exécution
|
|
||||||
|
|
||||||
- Lancer tailwindcss en mode watch dans un terminal :
|
|
||||||
```bash
|
|
||||||
./tailwindcss -i css/input.css -o assets/css/style.css --watch
|
|
||||||
```
|
|
||||||
|
|
||||||
- Lancer le serveur web dans un autre terminal :
|
|
||||||
```bash
|
|
||||||
cargo run --bin app
|
|
||||||
```
|
|
||||||
|
|
||||||
## Rechargement automatique (_auto-reload_)
|
|
||||||
|
|
||||||
Pour le projet `app`, nous utilisons en plus de `cargo-watch` ses librairies :
|
|
||||||
- [`systemfd`](https://github.com/mitsuhiko/systemfd) permet de redémarrer un serveur sans interrompre les connexions en cours, il transmet le descripteur de fichier du socket à une nouvelle instance du serveur (exemple: `cargo watch -x run` --> `systemfd --no-pid -s http::3000 -- cargo watch -x run`). Si le port est déjà pris il en prendra un autre.
|
|
||||||
- [`listenfd`](https://github.com/mitsuhiko/listenfd) permet, côté _Rust_, de démarrer un serveur en utilisant des connexions déjà ouvertes.
|
|
||||||
|
|
||||||
Pour notre application voici la commande à lancer :
|
|
||||||
|
|
||||||
```bash
|
|
||||||
systemfd --no-pid -s http::3000 -- cargo watch -x 'run --bin app'
|
|
||||||
```
|
|
||||||
|
|
||||||
## Chargement à chaud (_livereload_)
|
|
||||||
|
|
||||||
Pour que notre navigateur rafraîchisse automatique notre page lorsque le serveur a été recompilé, nous utilisons la librairie [`tower-livereload`](https://github.com/leotaku/tower-livereload).
|
|
||||||
|
|
||||||
A chaque changement, que ça soit sur du code en _Rust_, _HTML_, _CSS_ ou _JS_ alors le navigateur va recharger entièrement la page.
|
|
||||||
|
|
||||||
En Rust, il n'existe pas encore d'outil de _Hot Reload_ complet et intégré comme on en trouve dans d'autres environnements de développement web, comme pour _Node.js_.
|
|
@ -1,6 +0,0 @@
|
|||||||
[general]
|
|
||||||
# Directories to search for templates, relative to the crate root.
|
|
||||||
dirs = [
|
|
||||||
"src/pages",
|
|
||||||
"src/components",
|
|
||||||
]
|
|
File diff suppressed because it is too large
Load Diff
5
crates/app/assets/js/alpinejs@3.14.1.min.js
vendored
5
crates/app/assets/js/alpinejs@3.14.1.min.js
vendored
File diff suppressed because one or more lines are too long
2
crates/app/assets/js/flowbite@2.5.1.min.js
vendored
2
crates/app/assets/js/flowbite@2.5.1.min.js
vendored
File diff suppressed because one or more lines are too long
1
crates/app/assets/js/htmx@2.0.1.min.js
vendored
1
crates/app/assets/js/htmx@2.0.1.min.js
vendored
File diff suppressed because one or more lines are too long
@ -1,3 +0,0 @@
|
|||||||
@tailwind base;
|
|
||||||
@tailwind components;
|
|
||||||
@tailwind utilities;
|
|
@ -1,23 +0,0 @@
|
|||||||
{% if hx_request %}
|
|
||||||
<title>{% block title %}{{ title }}{% endblock %}</title>
|
|
||||||
{% block body %}{% endblock %}
|
|
||||||
{% else %}
|
|
||||||
<!doctype html>
|
|
||||||
<html lang="fr" class="h-full">
|
|
||||||
<head>
|
|
||||||
<title>{% block title %}{{ title }}{% endblock %}</title>
|
|
||||||
|
|
||||||
<script src="/assets/js/htmx@2.0.1.min.js"></script>
|
|
||||||
<script src="/assets/js/alpinejs@3.14.1.min.js" defer></script>
|
|
||||||
<script src="/assets/js/flowbite@2.5.1.min.js"></script>
|
|
||||||
<link href="/assets/css/style.css" rel="stylesheet">
|
|
||||||
|
|
||||||
{% block head %}{% endblock %}
|
|
||||||
</head>
|
|
||||||
<body class="h-full">
|
|
||||||
<div class="min-h-full">
|
|
||||||
{% block body %}{% endblock %}
|
|
||||||
</div>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
{% endif %}
|
|
@ -1,18 +0,0 @@
|
|||||||
{% set selected = item.id == current %}
|
|
||||||
<li>
|
|
||||||
<a
|
|
||||||
href="{{ item.href }}"
|
|
||||||
{% if selected -%}
|
|
||||||
class="block py-2 px-3 text-white bg-blue-700 rounded md:bg-transparent md:text-blue-700 md:p-0 md:dark:text-blue-500"
|
|
||||||
aria-current="page"
|
|
||||||
{% else -%}
|
|
||||||
class="block py-2 px-3 text-gray-900 rounded hover:bg-gray-100 md:hover:bg-transparent md:hover:text-blue-700 md:p-0 dark:text-white md:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white md:dark:hover:bg-transparent dark:border-gray-700"
|
|
||||||
{% endif -%}
|
|
||||||
hx-get="{{ item.href }}"
|
|
||||||
hx-push-url="true"
|
|
||||||
hx-swap="outerHTML"
|
|
||||||
hx-select-oob="#menu-items,#page-header,#page-main"
|
|
||||||
>
|
|
||||||
{{ item.label }}
|
|
||||||
</a>
|
|
||||||
</li>
|
|
@ -1,50 +0,0 @@
|
|||||||
{% macro navbar(current) %}
|
|
||||||
|
|
||||||
{% let items=crate::menu::get_menu_items() %}
|
|
||||||
|
|
||||||
<nav class="bg-white border-gray-200 dark:bg-gray-900">
|
|
||||||
<div class="max-w-screen-xl flex flex-wrap items-center justify-between mx-auto p-4">
|
|
||||||
<a href="/" class="flex items-center space-x-3 rtl:space-x-reverse">
|
|
||||||
<img src="https://flowbite.com/docs/images/logo.svg" class="h-8" alt="Flowbite Logo" />
|
|
||||||
<span class="self-center text-2xl font-semibold whitespace-nowrap dark:text-white">Krys4lide</span>
|
|
||||||
</a>
|
|
||||||
<div class="flex items-center md:order-2 space-x-3 md:space-x-0 rtl:space-x-reverse">
|
|
||||||
<button type="button" class="flex text-sm bg-gray-800 rounded-full md:me-0 focus:ring-4 focus:ring-gray-300 dark:focus:ring-gray-600" id="user-menu-button" aria-expanded="false" data-dropdown-toggle="user-dropdown" data-dropdown-placement="bottom">
|
|
||||||
<span class="sr-only">Ouvrir le menu de profil</span>
|
|
||||||
<img class="w-8 h-8 rounded-full" src="https://flowbite.com/docs/images/people/profile-picture-3.jpg" alt="user photo">
|
|
||||||
</button>
|
|
||||||
<!-- Dropdown menu -->
|
|
||||||
<div class="z-50 hidden my-4 text-base list-none bg-white divide-y divide-gray-100 rounded-lg shadow dark:bg-gray-700 dark:divide-gray-600" id="user-dropdown">
|
|
||||||
<div class="px-4 py-3">
|
|
||||||
<span class="block text-sm text-gray-900 dark:text-white">Bonnie Green</span>
|
|
||||||
<span class="block text-sm text-gray-500 truncate dark:text-gray-400">name@flowbite.com</span>
|
|
||||||
</div>
|
|
||||||
<ul class="py-2" aria-labelledby="user-menu-button">
|
|
||||||
<li>
|
|
||||||
<a href="#" class="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 dark:hover:bg-gray-600 dark:text-gray-200 dark:hover:text-white">Profile</a>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<a href="#" class="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 dark:hover:bg-gray-600 dark:text-gray-200 dark:hover:text-white">Settings</a>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<a href="#" class="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 dark:hover:bg-gray-600 dark:text-gray-200 dark:hover:text-white">Sign out</a>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
<button data-collapse-toggle="navbar-user" type="button" class="inline-flex items-center p-2 w-10 h-10 justify-center text-sm text-gray-500 rounded-lg md:hidden hover:bg-gray-100 focus:outline-none focus:ring-2 focus:ring-gray-200 dark:text-gray-400 dark:hover:bg-gray-700 dark:focus:ring-gray-600" aria-controls="navbar-user" aria-expanded="false">
|
|
||||||
<span class="sr-only">Ouvrir le menu de navigation</span>
|
|
||||||
<svg class="w-5 h-5" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 17 14">
|
|
||||||
<path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M1 1h15M1 7h15M1 13h15"/>
|
|
||||||
</svg>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
<div class="items-center justify-between hidden w-full md:flex md:w-auto md:order-1" id="navbar-user">
|
|
||||||
<ul id="menu-items" class="flex flex-col font-medium p-4 md:p-0 mt-4 border border-gray-100 rounded-lg bg-gray-50 md:space-x-8 rtl:space-x-reverse md:flex-row md:mt-0 md:border-0 md:bg-white dark:bg-gray-800 md:dark:bg-gray-900 dark:border-gray-700">
|
|
||||||
{% for item in items %}
|
|
||||||
{% include "navbar/menu-item.html" %}
|
|
||||||
{% endfor %}
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</nav>
|
|
||||||
{% endmacro %}
|
|
@ -1,22 +0,0 @@
|
|||||||
<div role="status" class="animate-pulse max-w-sm p-4 border border-gray-200 rounded shadow md:p-6 dark:border-gray-700">
|
|
||||||
<div class="flex items-center justify-center h-48 mb-4 bg-gray-300 rounded dark:bg-gray-700">
|
|
||||||
<svg class="w-10 h-10 text-gray-200 dark:text-gray-600" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 16 20">
|
|
||||||
<path d="M14.066 0H7v5a2 2 0 0 1-2 2H0v11a1.97 1.97 0 0 0 1.934 2h12.132A1.97 1.97 0 0 0 16 18V2a1.97 1.97 0 0 0-1.934-2ZM10.5 6a1.5 1.5 0 1 1 0 2.999A1.5 1.5 0 0 1 10.5 6Zm2.221 10.515a1 1 0 0 1-.858.485h-8a1 1 0 0 1-.9-1.43L5.6 10.039a.978.978 0 0 1 .936-.57 1 1 0 0 1 .9.632l1.181 2.981.541-1a.945.945 0 0 1 .883-.522 1 1 0 0 1 .879.529l1.832 3.438a1 1 0 0 1-.031.988Z"/>
|
|
||||||
<path d="M5 5V.13a2.96 2.96 0 0 0-1.293.749L.879 3.707A2.98 2.98 0 0 0 .13 5H5Z"/>
|
|
||||||
</svg>
|
|
||||||
</div>
|
|
||||||
<div class="h-2.5 bg-gray-200 rounded-full dark:bg-gray-700 w-48 mb-4"></div>
|
|
||||||
<div class="h-2 bg-gray-200 rounded-full dark:bg-gray-700 mb-2.5"></div>
|
|
||||||
<div class="h-2 bg-gray-200 rounded-full dark:bg-gray-700 mb-2.5"></div>
|
|
||||||
<div class="h-2 bg-gray-200 rounded-full dark:bg-gray-700"></div>
|
|
||||||
<div class="flex items-center mt-4">
|
|
||||||
<svg class="w-10 h-10 me-3 text-gray-200 dark:text-gray-700" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 20 20">
|
|
||||||
<path d="M10 0a10 10 0 1 0 10 10A10.011 10.011 0 0 0 10 0Zm0 5a3 3 0 1 1 0 6 3 3 0 0 1 0-6Zm0 13a8.949 8.949 0 0 1-4.951-1.488A3.987 3.987 0 0 1 9 13h2a3.987 3.987 0 0 1 3.951 3.512A8.949 8.949 0 0 1 10 18Z"/>
|
|
||||||
</svg>
|
|
||||||
<div>
|
|
||||||
<div class="h-2.5 bg-gray-200 rounded-full dark:bg-gray-700 w-32 mb-2"></div>
|
|
||||||
<div class="w-48 h-2 bg-gray-200 rounded-full dark:bg-gray-700"></div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<span class="sr-only">Loading...</span>
|
|
||||||
</div>
|
|
@ -1,4 +0,0 @@
|
|||||||
<div role="status" class="animate-pulse flex items-center justify-center h-full">
|
|
||||||
<div class="w-32 h-4 bg-gray-200 rounded-full dark:bg-gray-700 me-3"></div>
|
|
||||||
<div class="w-32 h-4 bg-gray-200 rounded-full dark:bg-gray-700"></div>
|
|
||||||
</div>
|
|
@ -1 +0,0 @@
|
|||||||
<div role="status" class="animate-pulse h-7 bg-gray-200 rounded-full dark:bg-gray-700 w-48 mt-3"></div>
|
|
@ -1,21 +0,0 @@
|
|||||||
use std::path::PathBuf;
|
|
||||||
|
|
||||||
use axum::http::{StatusCode, Uri};
|
|
||||||
use axum_htmx::AutoVaryLayer;
|
|
||||||
use tower_http::services::ServeDir;
|
|
||||||
|
|
||||||
mod menu;
|
|
||||||
mod pages;
|
|
||||||
|
|
||||||
async fn fallback(uri: Uri) -> (StatusCode, String) {
|
|
||||||
(StatusCode::NOT_FOUND, format!("No route for {uri}"))
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn get_router(assets_path: PathBuf) -> axum::Router<()> {
|
|
||||||
axum::Router::new()
|
|
||||||
.nest_service("/assets", ServeDir::new(assets_path))
|
|
||||||
.merge(pages::get_routes())
|
|
||||||
.fallback(fallback)
|
|
||||||
// The AutoVaryLayer is used to avoid cache issues with htmx (cf: https://github.com/robertwayne/axum-htmx?tab=readme-ov-file#auto-caching-management)
|
|
||||||
.layer(AutoVaryLayer)
|
|
||||||
}
|
|
@ -1,84 +0,0 @@
|
|||||||
use std::path::{Path, PathBuf};
|
|
||||||
use std::{env, io};
|
|
||||||
|
|
||||||
use axum::body::Body;
|
|
||||||
use axum::http::Request;
|
|
||||||
use listenfd::ListenFd;
|
|
||||||
use notify::Watcher;
|
|
||||||
use thiserror::Error;
|
|
||||||
use tokio::net::TcpListener;
|
|
||||||
use tower_livereload::predicate::Predicate;
|
|
||||||
use tower_livereload::LiveReloadLayer;
|
|
||||||
|
|
||||||
use ::app::get_router;
|
|
||||||
|
|
||||||
#[derive(Error, Debug)]
|
|
||||||
pub enum AppError {
|
|
||||||
#[error("Unable to bind to TCP listener")]
|
|
||||||
TCPListener(#[from] std::io::Error),
|
|
||||||
#[error("Error with the notify watcher")]
|
|
||||||
NotifyWatcher(#[from] notify::Error),
|
|
||||||
#[error("Missing environment variable {var}")]
|
|
||||||
MissingEnvVar { var: &'static str },
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Nous filtrons les requêtes de `htmx` pour ne pas inclure le script _JS_ qui gère le rechargement
|
|
||||||
/// Voir https://github.com/leotaku/tower-livereload/pull/3
|
|
||||||
#[derive(Copy, Clone)]
|
|
||||||
struct NotHtmxPredicate;
|
|
||||||
impl<T> Predicate<Request<T>> for NotHtmxPredicate {
|
|
||||||
fn check(&mut self, req: &Request<T>) -> bool {
|
|
||||||
!(req.headers().contains_key("hx-request"))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const DEFAULT_LISTENER: &str = "localhost:3000";
|
|
||||||
async fn get_tcp_listener() -> Result<TcpListener, io::Error> {
|
|
||||||
let mut listenfd = ListenFd::from_env();
|
|
||||||
|
|
||||||
match listenfd.take_tcp_listener(0)? {
|
|
||||||
// if we are given a tcp listener on listen fd 0, we use that one
|
|
||||||
Some(listener) => {
|
|
||||||
listener.set_nonblocking(true)?;
|
|
||||||
Ok(TcpListener::from_std(listener)?)
|
|
||||||
}
|
|
||||||
// otherwise fall back to local listening
|
|
||||||
None => Ok(TcpListener::bind(DEFAULT_LISTENER).await?),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn get_livereload_layer(
|
|
||||||
templates_paths: Vec<PathBuf>,
|
|
||||||
) -> Result<LiveReloadLayer<NotHtmxPredicate>, notify::Error> {
|
|
||||||
let livereload = LiveReloadLayer::new();
|
|
||||||
let reloader = livereload.reloader();
|
|
||||||
let mut watcher = notify::recommended_watcher(move |_| reloader.reload())?;
|
|
||||||
for templates_path in templates_paths {
|
|
||||||
watcher.watch(templates_path.as_path(), notify::RecursiveMode::Recursive)?;
|
|
||||||
}
|
|
||||||
Ok(livereload.request_predicate::<Body, NotHtmxPredicate>(NotHtmxPredicate))
|
|
||||||
}
|
|
||||||
|
|
||||||
#[tokio::main]
|
|
||||||
async fn main() -> Result<(), AppError> {
|
|
||||||
let manifest_dir = env::var("CARGO_MANIFEST_DIR").map_err(|_| AppError::MissingEnvVar {
|
|
||||||
var: "CARGO_MANIFEST_DIR",
|
|
||||||
})?;
|
|
||||||
let assets_path = Path::new(&manifest_dir).join("assets");
|
|
||||||
let templates_paths = vec![
|
|
||||||
Path::new(&manifest_dir).join("src/pages"),
|
|
||||||
Path::new(&manifest_dir).join("src/components"),
|
|
||||||
];
|
|
||||||
|
|
||||||
let livereload_layer =
|
|
||||||
get_livereload_layer(templates_paths).map_err(AppError::NotifyWatcher)?;
|
|
||||||
let router = get_router(assets_path).await.layer(livereload_layer);
|
|
||||||
|
|
||||||
let listener: TcpListener = get_tcp_listener().await.map_err(AppError::TCPListener)?;
|
|
||||||
let local_addr = listener.local_addr().map_err(AppError::TCPListener)?;
|
|
||||||
println!("Listening on: http://{}", local_addr);
|
|
||||||
|
|
||||||
// Run the server with the router
|
|
||||||
axum::serve(listener, router.into_make_service()).await?;
|
|
||||||
Ok(())
|
|
||||||
}
|
|
@ -1,23 +0,0 @@
|
|||||||
pub struct MenuItem {
|
|
||||||
pub id: String,
|
|
||||||
pub label: String,
|
|
||||||
pub href: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Get the menu items
|
|
||||||
/// This function is the central place to define the menu items
|
|
||||||
/// It can be used directly in templates, for example in the `navbar` component to render the menu
|
|
||||||
pub fn get_menu_items() -> Vec<MenuItem> {
|
|
||||||
vec![
|
|
||||||
MenuItem {
|
|
||||||
id: "home".to_string(),
|
|
||||||
label: "Accueil".to_string(),
|
|
||||||
href: "/".to_string(),
|
|
||||||
},
|
|
||||||
MenuItem {
|
|
||||||
id: "cps".to_string(),
|
|
||||||
label: "CPS".to_string(),
|
|
||||||
href: "/cps".to_string(),
|
|
||||||
},
|
|
||||||
]
|
|
||||||
}
|
|
@ -1,43 +0,0 @@
|
|||||||
{% extends "base.html" %}
|
|
||||||
{% import "navbar/navbar.html" as navbar -%}
|
|
||||||
|
|
||||||
{% block title %}Pharma Libre - CPS{% endblock %}
|
|
||||||
|
|
||||||
{% block body %}
|
|
||||||
{% call navbar::navbar(current="cps") %}
|
|
||||||
<div class="py-10">
|
|
||||||
<header id="page-header">
|
|
||||||
<div class="mx-auto max-w-7xl px-4 sm:px-6 lg:px-8">
|
|
||||||
<h1
|
|
||||||
id="page-title"
|
|
||||||
class="text-3xl font-bold leading-tight tracking-tight text-gray-900"
|
|
||||||
>
|
|
||||||
CPS
|
|
||||||
</h1>
|
|
||||||
</div>
|
|
||||||
</header>
|
|
||||||
<main id="page-main">
|
|
||||||
<div
|
|
||||||
class="mx-auto max-w-7xl px-4 py-8 sm:px-6 lg:px-8"
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-96 mb-4"
|
|
||||||
>A</div>
|
|
||||||
<div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-4 mb-4">
|
|
||||||
<div
|
|
||||||
class="border-2 border-dashed border-gray-300 rounded-lg dark:border-gray-600 h-32 md:h-64"
|
|
||||||
>B</div>
|
|
||||||
<div
|
|
||||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-32 md:h-64"
|
|
||||||
>C</div>
|
|
||||||
<div
|
|
||||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-32 md:h-64"
|
|
||||||
>D</div>
|
|
||||||
<div
|
|
||||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-32 md:h-64"
|
|
||||||
>E</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</main>
|
|
||||||
</div>
|
|
||||||
{% endblock %}
|
|
@ -1,12 +0,0 @@
|
|||||||
use askama_axum::Template;
|
|
||||||
use axum_htmx::HxRequest;
|
|
||||||
|
|
||||||
#[derive(Template)]
|
|
||||||
#[template(path = "cps.html")]
|
|
||||||
pub struct CpsTemplate {
|
|
||||||
hx_request: bool,
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn cps(HxRequest(hx_request): HxRequest) -> CpsTemplate {
|
|
||||||
CpsTemplate { hx_request }
|
|
||||||
}
|
|
@ -1,43 +0,0 @@
|
|||||||
{% extends "base.html" %}
|
|
||||||
{% import "navbar/navbar.html" as navbar -%}
|
|
||||||
|
|
||||||
{% block title %}Pharma Libre - Accueil{% endblock %}
|
|
||||||
|
|
||||||
{% block body %}
|
|
||||||
{% call navbar::navbar(current="home") %}
|
|
||||||
<div class="py-10">
|
|
||||||
<header id="page-header">
|
|
||||||
<div class="mx-auto max-w-7xl px-4 sm:px-6 lg:px-8">
|
|
||||||
<h1
|
|
||||||
id="page-title"
|
|
||||||
class="text-3xl font-bold leading-tight tracking-tight text-gray-900"
|
|
||||||
>
|
|
||||||
Accueil
|
|
||||||
</h1>
|
|
||||||
</div>
|
|
||||||
</header>
|
|
||||||
<main id="page-main">
|
|
||||||
<div
|
|
||||||
class="mx-auto max-w-7xl px-4 py-8 sm:px-6 lg:px-8"
|
|
||||||
>
|
|
||||||
<div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-4 mb-4">
|
|
||||||
<div
|
|
||||||
class="border-2 border-dashed border-gray-300 rounded-lg dark:border-gray-600 h-32 md:h-64"
|
|
||||||
>A</div>
|
|
||||||
<div
|
|
||||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-32 md:h-64"
|
|
||||||
>B</div>
|
|
||||||
<div
|
|
||||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-32 md:h-64"
|
|
||||||
>C</div>
|
|
||||||
<div
|
|
||||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-32 md:h-64"
|
|
||||||
>D</div>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-96 mb-4"
|
|
||||||
>E</div>
|
|
||||||
</div>
|
|
||||||
</main>
|
|
||||||
</div>
|
|
||||||
{% endblock %}
|
|
@ -1,12 +0,0 @@
|
|||||||
use askama_axum::Template;
|
|
||||||
use axum_htmx::HxRequest;
|
|
||||||
|
|
||||||
#[derive(Template)]
|
|
||||||
#[template(path = "home.html")]
|
|
||||||
pub struct GetHomeTemplate {
|
|
||||||
hx_request: bool,
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn home(HxRequest(hx_request): HxRequest) -> GetHomeTemplate {
|
|
||||||
GetHomeTemplate { hx_request }
|
|
||||||
}
|
|
@ -1,10 +0,0 @@
|
|||||||
use axum::{routing, Router};
|
|
||||||
|
|
||||||
mod cps;
|
|
||||||
mod home;
|
|
||||||
|
|
||||||
pub fn get_routes() -> Router {
|
|
||||||
Router::new()
|
|
||||||
.route("/", routing::get(home::home))
|
|
||||||
.route("/cps", routing::get(cps::cps))
|
|
||||||
}
|
|
@ -1,12 +0,0 @@
|
|||||||
/** @type {import('tailwindcss').Config} */
|
|
||||||
module.exports = {
|
|
||||||
content: [
|
|
||||||
'./src/**/*.html',
|
|
||||||
'./css/**/*.css',
|
|
||||||
],
|
|
||||||
theme: {
|
|
||||||
extend: {},
|
|
||||||
},
|
|
||||||
plugins: [],
|
|
||||||
}
|
|
||||||
|
|
@ -5,10 +5,25 @@ edition = "2021"
|
|||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
anyhow = "1.0.89"
|
anyhow = "1.0.89"
|
||||||
axum = "0.7.6"
|
axum = { version = "0.7.6", features = ["macros"] }
|
||||||
listenfd = "1.0.1"
|
listenfd = "1.0.1"
|
||||||
tokio = { version = "1.40.0", features = ["macros", "rt-multi-thread"] }
|
tokio = { version = "1.40.0", features = ["macros", "rt-multi-thread"] }
|
||||||
|
tower-http = { version = "0.6.1", features = ["cors"] }
|
||||||
|
|
||||||
|
sea-orm = { workspace = true, features = [
|
||||||
|
# Same `ASYNC_RUNTIME` and `DATABASE_DRIVER` as in the migration crate
|
||||||
|
"sqlx-sqlite",
|
||||||
|
"runtime-tokio-rustls",
|
||||||
|
"macros",
|
||||||
|
] }
|
||||||
|
serde.workspace = true
|
||||||
|
thiserror.workspace = true
|
||||||
|
|
||||||
|
entity = { path = "../../entity" }
|
||||||
|
migration = { path = "../../migration" }
|
||||||
|
utils = { path = "../utils" }
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
cargo-watch = "8.5.2"
|
cargo-watch = "8.5.2"
|
||||||
|
sea-orm-cli.workspace = true
|
||||||
systemfd = "0.4.3"
|
systemfd = "0.4.3"
|
||||||
|
@ -10,10 +10,19 @@ En développement, le mécanisme de hot-reload nécessite de disposer de `cargo-
|
|||||||
cargo install cargo-watch systemfd
|
cargo install cargo-watch systemfd
|
||||||
```
|
```
|
||||||
|
|
||||||
|
## Configuration
|
||||||
|
|
||||||
|
> Astuce : lorsqu'on exécute directement la crate `backend` à des fins de développement, le système de configuration n'utilisera pas l'éventuel fichier `.env` situé à la racine du workspace Rust. Pour éviter de dupliquer le fichier `.env`, il est possible de créer un lien symbolique vers le fichier `.env` de la crate `backend` :
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd crates/backend
|
||||||
|
ln -s ../../.env .env
|
||||||
|
```
|
||||||
|
|
||||||
## Développement
|
## Développement
|
||||||
|
|
||||||
Pour lancer le serveur en mode développement, exécutez la commande suivante :
|
Pour lancer le serveur en mode développement, exécutez la commande suivante :
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
systemfd --no-pid -s http::3030 -- cargo watch -x 'run --bin backend'
|
systemfd --no-pid -s http::8080 -- cargo watch -w crates/backend -x 'run --bin backend'
|
||||||
```
|
```
|
||||||
|
48
crates/backend/src/api/debug.rs
Normal file
48
crates/backend/src/api/debug.rs
Normal file
@ -0,0 +1,48 @@
|
|||||||
|
use axum::{extract::State, routing, Json};
|
||||||
|
use sea_orm::*;
|
||||||
|
use serde::Serialize;
|
||||||
|
|
||||||
|
use ::entity::{debug, debug::Entity as DebugEntity};
|
||||||
|
|
||||||
|
use crate::{AppError, AppState};
|
||||||
|
|
||||||
|
// DATABASE DEBUG CONTROLLERS
|
||||||
|
|
||||||
|
async fn get_debug_entries(db: &DatabaseConnection) -> Result<Vec<debug::Model>, DbErr> {
|
||||||
|
DebugEntity::find().all(db).await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn add_random_debug_entry(State(AppState { db_connection }): State<AppState>) {
|
||||||
|
let random_entry = debug::ActiveModel {
|
||||||
|
title: Set("Random title".to_string()),
|
||||||
|
text: Set("Random text".to_string()),
|
||||||
|
..Default::default()
|
||||||
|
};
|
||||||
|
random_entry.insert(&db_connection).await.unwrap();
|
||||||
|
}
|
||||||
|
|
||||||
|
// API HANDLER
|
||||||
|
|
||||||
|
#[derive(Serialize, Debug)]
|
||||||
|
struct DebugResponse {
|
||||||
|
db_ping_status: bool,
|
||||||
|
entries: Vec<debug::Model>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[axum::debug_handler]
|
||||||
|
async fn debug(
|
||||||
|
State(AppState { db_connection }): State<AppState>,
|
||||||
|
) -> Result<Json<DebugResponse>, AppError> {
|
||||||
|
let db_ping_status = db_connection.ping().await.is_ok();
|
||||||
|
let debug_entries = get_debug_entries(&db_connection).await?;
|
||||||
|
Ok(Json(DebugResponse {
|
||||||
|
db_ping_status,
|
||||||
|
entries: debug_entries,
|
||||||
|
}))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn get_routes() -> axum::Router<crate::AppState> {
|
||||||
|
axum::Router::new()
|
||||||
|
.route("/", routing::get(debug))
|
||||||
|
.route("/add_random", routing::post(add_random_debug_entry))
|
||||||
|
}
|
9
crates/backend/src/api/mod.rs
Normal file
9
crates/backend/src/api/mod.rs
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
use axum::Router;
|
||||||
|
|
||||||
|
use crate::AppState;
|
||||||
|
|
||||||
|
mod debug;
|
||||||
|
|
||||||
|
pub fn get_routes() -> Router<AppState> {
|
||||||
|
Router::new().nest("/debug", debug::get_routes())
|
||||||
|
}
|
11
crates/backend/src/db.rs
Normal file
11
crates/backend/src/db.rs
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
use migration::{Migrator, MigratorTrait};
|
||||||
|
use sea_orm::{Database, DatabaseConnection, DbErr};
|
||||||
|
use std::env;
|
||||||
|
|
||||||
|
pub async fn get_connection() -> Result<DatabaseConnection, DbErr> {
|
||||||
|
let database_url = env::var("DATABASE_URL").expect("DATABASE_URL must be set");
|
||||||
|
|
||||||
|
let db_connection = Database::connect(database_url).await?;
|
||||||
|
Migrator::up(&db_connection, None).await?;
|
||||||
|
Ok(db_connection)
|
||||||
|
}
|
@ -1,12 +1,47 @@
|
|||||||
use anyhow::Error as AnyError;
|
use anyhow::Error as AnyError;
|
||||||
use axum::http::{StatusCode, Uri};
|
use axum::http::{header, StatusCode, Uri};
|
||||||
use axum::response::{IntoResponse, Response};
|
use axum::response::{IntoResponse, Response};
|
||||||
use axum::{routing::get, Router};
|
use axum::{routing::get, Router};
|
||||||
|
use sea_orm::{DatabaseConnection, DbErr};
|
||||||
|
use thiserror::Error;
|
||||||
|
use tower_http::cors::{Any, CorsLayer};
|
||||||
|
|
||||||
pub fn get_router() -> Router {
|
use ::utils::config::{load_config, ConfigError};
|
||||||
Router::new()
|
|
||||||
|
mod api;
|
||||||
|
mod db;
|
||||||
|
|
||||||
|
#[derive(Error, Debug)]
|
||||||
|
pub enum InitError {
|
||||||
|
#[error(transparent)]
|
||||||
|
ConfigError(#[from] ConfigError),
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn init() -> Result<(), InitError> {
|
||||||
|
load_config(None)?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Clone)]
|
||||||
|
pub struct AppState {
|
||||||
|
db_connection: DatabaseConnection,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn get_router() -> Result<Router, DbErr> {
|
||||||
|
let db_connection = db::get_connection().await?;
|
||||||
|
let state: AppState = AppState { db_connection };
|
||||||
|
|
||||||
|
let cors = CorsLayer::new()
|
||||||
|
.allow_methods(Any)
|
||||||
|
.allow_origin(Any)
|
||||||
|
.allow_headers([header::CONTENT_TYPE]);
|
||||||
|
|
||||||
|
Ok(Router::new()
|
||||||
.route("/", get(|| async { "Hello, world!" }))
|
.route("/", get(|| async { "Hello, world!" }))
|
||||||
|
.merge(api::get_routes())
|
||||||
.fallback(fallback)
|
.fallback(fallback)
|
||||||
|
.with_state(state)
|
||||||
|
.layer(cors))
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn fallback(uri: Uri) -> (StatusCode, String) {
|
async fn fallback(uri: Uri) -> (StatusCode, String) {
|
||||||
|
@ -1,24 +1,39 @@
|
|||||||
use listenfd::ListenFd;
|
use listenfd::ListenFd;
|
||||||
|
use thiserror::Error;
|
||||||
use tokio::net::TcpListener;
|
use tokio::net::TcpListener;
|
||||||
|
|
||||||
use backend::get_router;
|
use backend::{get_router, init, InitError};
|
||||||
|
|
||||||
|
#[derive(Error, Debug)]
|
||||||
|
pub enum BackendError {
|
||||||
|
#[error("Error while setting up or serving the TCP listener")]
|
||||||
|
ServeTCPListener(#[from] std::io::Error),
|
||||||
|
#[error("Error while initialising the backend")]
|
||||||
|
InitError(#[from] InitError),
|
||||||
|
#[error("Error with the database connection")]
|
||||||
|
DatabaseConnection(#[from] sea_orm::DbErr),
|
||||||
|
}
|
||||||
|
|
||||||
#[tokio::main]
|
#[tokio::main]
|
||||||
async fn main() {
|
async fn main() -> Result<(), BackendError> {
|
||||||
let app = get_router();
|
init()?;
|
||||||
|
|
||||||
|
let app = get_router().await?;
|
||||||
|
|
||||||
let mut listenfd = ListenFd::from_env();
|
let mut listenfd = ListenFd::from_env();
|
||||||
|
let listener = match listenfd.take_tcp_listener(0)? {
|
||||||
let listener = match listenfd.take_tcp_listener(0).unwrap() {
|
|
||||||
// if we are given a tcp listener on listen fd 0, we use that one
|
// if we are given a tcp listener on listen fd 0, we use that one
|
||||||
Some(listener) => {
|
Some(listener) => {
|
||||||
listener.set_nonblocking(true).unwrap();
|
listener.set_nonblocking(true)?;
|
||||||
TcpListener::from_std(listener).unwrap()
|
TcpListener::from_std(listener)?
|
||||||
}
|
}
|
||||||
// otherwise fall back to local listening
|
// otherwise fall back to local listening
|
||||||
None => TcpListener::bind("0.0.0.0:8080").await.unwrap(),
|
None => TcpListener::bind("0.0.0.0:8080").await?,
|
||||||
};
|
};
|
||||||
|
|
||||||
println!("Listening on {}", listener.local_addr().unwrap());
|
let local_addr = listener.local_addr()?;
|
||||||
axum::serve(listener, app).await.unwrap();
|
println!("Listening on http://{}", local_addr);
|
||||||
|
axum::serve(listener, app).await?;
|
||||||
|
|
||||||
|
Ok(())
|
||||||
}
|
}
|
||||||
|
@ -13,8 +13,12 @@ crate-type = ["lib", "cdylib", "staticlib"]
|
|||||||
tauri-build = { version = "2.0.0-rc", features = [] }
|
tauri-build = { version = "2.0.0-rc", features = [] }
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
tauri = { version = "2.0.0-rc", features = [] }
|
bytes = "1.6.1"
|
||||||
tauri-plugin-shell = "2.0.0-rc"
|
http = "1.1.0"
|
||||||
serde = { version = "1", features = ["derive"] }
|
serde = { version = "1", features = ["derive"] }
|
||||||
serde_json = "1"
|
serde_json = "1"
|
||||||
|
tauri = { version = "2.0.0-rc", features = [] }
|
||||||
|
tauri-plugin-shell = "2.0.0-rc"
|
||||||
|
tower = "0.4.13"
|
||||||
|
|
||||||
|
thiserror.workspace = true
|
||||||
|
@ -11,7 +11,11 @@ links = "ssvlux64,ssvosx,Ssvw64"
|
|||||||
[dependencies]
|
[dependencies]
|
||||||
libc = "0.2.159"
|
libc = "0.2.159"
|
||||||
libloading = "0.8.5"
|
libloading = "0.8.5"
|
||||||
thiserror = "1.0.64"
|
|
||||||
|
thiserror.workspace = true
|
||||||
|
|
||||||
[build-dependencies]
|
[build-dependencies]
|
||||||
bindgen = "0.70.1"
|
bindgen = "0.70.1"
|
||||||
|
|
||||||
|
[dev-dependencies]
|
||||||
|
chrono = "0.4.38"
|
||||||
|
32
crates/fsv-sys/PROGRESS.md
Normal file
32
crates/fsv-sys/PROGRESS.md
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
# État d'avancement de l'implémentation des bindings FSV
|
||||||
|
|
||||||
|
| Module | Progression |
|
||||||
|
|-------------|------------------------------------|
|
||||||
|
| [SSV](#ssv) |  |
|
||||||
|
| [SGD](#sgd) |  |
|
||||||
|
| [SRT](#srt) |  |
|
||||||
|
| [STS](#sts) |  |
|
||||||
|
|
||||||
|
## SSV
|
||||||
|
|
||||||
|
| Fonctions implémentées |
|
||||||
|
|------------------------|
|
||||||
|
| SSV_InitLIB2 |
|
||||||
|
| SSV_LireConfig |
|
||||||
|
| SSV_LireCartePS |
|
||||||
|
| SSV_LireDroitsVitale |
|
||||||
|
|
||||||
|
## SGD
|
||||||
|
|
||||||
|
| Fonctions implémentées |
|
||||||
|
|------------------------|
|
||||||
|
|
||||||
|
## SRT
|
||||||
|
|
||||||
|
| Fonctions implémentées |
|
||||||
|
|------------------------|
|
||||||
|
|
||||||
|
## STS
|
||||||
|
|
||||||
|
| Fonctions implémentées |
|
||||||
|
|------------------------|
|
@ -1,5 +1,18 @@
|
|||||||
# FSV-sys, bindings Rust pour le package FSV SESAM-Vitale
|
# FSV-sys, bindings Rust pour le package FSV SESAM-Vitale
|
||||||
|
|
||||||
|
## Librairies FSV
|
||||||
|
|
||||||
|
### Versions supportées
|
||||||
|
|
||||||
|
| Version FSV |
|
||||||
|
|-------------|
|
||||||
|
| 1.40.14 |
|
||||||
|
| 1.40.13 |
|
||||||
|
|
||||||
|
### État d'avancement de l'implémentation des bindings FSV
|
||||||
|
|
||||||
|
Les détails de l'avancement de l'implémentation des bindings FSV sont donnés dans le fichier [PROGRESS.md](PROGRESS.md)
|
||||||
|
|
||||||
## Utilisation
|
## Utilisation
|
||||||
|
|
||||||
### Pré-requis
|
### Pré-requis
|
||||||
@ -19,5 +32,5 @@
|
|||||||
|
|
||||||
### Pré-requis
|
### Pré-requis
|
||||||
|
|
||||||
- Pour la génération des bindings lors de la pahse de `build` à l'aide de `bindgen`, il est nécessaire d'avoir installé `clang` ([documentation](https://rust-lang.github.io/rust-bindgen/requirements.html)).
|
- Pour la génération des bindings lors de la phase de `build` à l'aide de `bindgen`, il est nécessaire d'avoir installé `clang` ([documentation](https://rust-lang.github.io/rust-bindgen/requirements.html)).
|
||||||
|
|
||||||
|
12
crates/fsv-sys/src/bindings.rs
Normal file
12
crates/fsv-sys/src/bindings.rs
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
#![allow(non_upper_case_globals)]
|
||||||
|
#![allow(non_camel_case_types)]
|
||||||
|
#![allow(non_snake_case)]
|
||||||
|
#![allow(unused)]
|
||||||
|
|
||||||
|
pub mod BINDINGS_V1_40_14 {
|
||||||
|
include!(concat!(env!("OUT_DIR"), "/bindings_1.40.14.rs"));
|
||||||
|
}
|
||||||
|
|
||||||
|
pub mod BINDINGS_V1_40_13 {
|
||||||
|
include!(concat!(env!("OUT_DIR"), "/bindings_1.40.13.rs"));
|
||||||
|
}
|
@ -1,14 +1,17 @@
|
|||||||
#![allow(non_upper_case_globals)]
|
|
||||||
#![allow(non_camel_case_types)]
|
|
||||||
#![allow(non_snake_case)]
|
#![allow(non_snake_case)]
|
||||||
|
|
||||||
#[derive(Debug)]
|
use std::marker::PhantomData;
|
||||||
pub enum SUPPORTED_FSV_VERSIONS {
|
|
||||||
|
mod bindings;
|
||||||
|
use bindings::*;
|
||||||
|
|
||||||
|
#[derive(Debug, Clone)]
|
||||||
|
pub enum SupportedFsvVersion {
|
||||||
V1_40_14, // 1.40.14
|
V1_40_14, // 1.40.14
|
||||||
V1_40_13, // 1.40.13
|
V1_40_13, // 1.40.13
|
||||||
}
|
}
|
||||||
|
|
||||||
impl SUPPORTED_FSV_VERSIONS {
|
impl SupportedFsvVersion {
|
||||||
fn as_str(&self) -> &'static str {
|
fn as_str(&self) -> &'static str {
|
||||||
match self {
|
match self {
|
||||||
Self::V1_40_14 => "1.40.14",
|
Self::V1_40_14 => "1.40.14",
|
||||||
@ -17,32 +20,6 @@ impl SUPPORTED_FSV_VERSIONS {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub mod BINDINGS {
|
|
||||||
include!(concat!(env!("OUT_DIR"), "/bindings_1.40.13.rs"));
|
|
||||||
}
|
|
||||||
|
|
||||||
// We need to keep the this use statement to get `ssv_function` macro working well
|
|
||||||
use BINDINGS::*;
|
|
||||||
|
|
||||||
/// Macro to generate a function that implements a call to an external function in BINDINGS
|
|
||||||
macro_rules! ssv_function {
|
|
||||||
($binding:ty, $func_name:ident, {$($arg_name:ident: $arg_type:ty),*}) => {
|
|
||||||
/// # Safety
|
|
||||||
/// This function is unsafe because it calls an external function through FFI.
|
|
||||||
/// The caller must ensure that the provided arguments are valid and that the
|
|
||||||
/// external function is safe to call.
|
|
||||||
pub unsafe fn $func_name(&self, $($arg_name: $arg_type),*) -> Result<u16, Error> {
|
|
||||||
let func_struct: libloading::Symbol<'_, $binding> =
|
|
||||||
unsafe { self.library.get(stringify!($binding).as_bytes())? };
|
|
||||||
let func = match *func_struct {
|
|
||||||
Some(func) => func,
|
|
||||||
None => return Err(Error::SymbolMissing(stringify!($binding))),
|
|
||||||
};
|
|
||||||
Ok(func($($arg_name),*))
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(thiserror::Error, Debug)]
|
#[derive(thiserror::Error, Debug)]
|
||||||
pub enum Error {
|
pub enum Error {
|
||||||
#[error(transparent)]
|
#[error(transparent)]
|
||||||
@ -51,15 +28,139 @@ pub enum Error {
|
|||||||
SymbolMissing(&'static str),
|
SymbolMissing(&'static str),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Macro to generate a function that implements a call to an external function in BINDINGS
|
||||||
|
macro_rules! ssv_function {
|
||||||
|
($binding:ty, $func_name:ident, {$($arg_name:ident: $arg_type:ty),*}) => {
|
||||||
|
/// # Safety
|
||||||
|
/// This function is unsafe because it calls an external function through FFI.
|
||||||
|
/// The caller must ensure that the provided arguments are valid and that the
|
||||||
|
/// external function is safe to call.
|
||||||
|
pub unsafe fn $func_name(&self, $($arg_name: $arg_type),*) -> Result<u16, Error> {
|
||||||
|
let symbol_name = match stringify!($binding)
|
||||||
|
.split(&[' ', ':'])
|
||||||
|
.last() {
|
||||||
|
Some(name) => name,
|
||||||
|
None => return Err(Error::SymbolMissing(stringify!($binding))),
|
||||||
|
};
|
||||||
|
let func_struct: libloading::Symbol<'_, $binding> =
|
||||||
|
unsafe { self.library.get(symbol_name.as_bytes())? };
|
||||||
|
let func = match *func_struct {
|
||||||
|
Some(func) => func,
|
||||||
|
None => return Err(Error::SymbolMissing(stringify!($binding))),
|
||||||
|
};
|
||||||
|
Ok(func($($arg_name),*))
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/// `sealed::Sealed` trait is used to prevent external crates from implementing the LibVersion trait.
|
||||||
|
mod sealed { pub trait Sealed {}}
|
||||||
|
|
||||||
/// Wrapper around the SESAM-VITALE library
|
/// Wrapper around the SESAM-VITALE library
|
||||||
/// This struct is responsible for loading the library and providing an interface to call its functions.
|
/// This struct is responsible for loading the library and providing an interface to call its functions.
|
||||||
/// The library is loaded at creation and kept in memory until the struct is dropped.
|
/// The library is loaded at creation and kept in memory until the struct is dropped.
|
||||||
#[derive(Debug)]
|
pub trait SSVLibraryCommon {
|
||||||
pub struct SSVLibrary {
|
fn new(path: &str) -> Result<Self, Error> where Self: Sized;
|
||||||
version: SUPPORTED_FSV_VERSIONS,
|
}
|
||||||
|
|
||||||
|
pub trait SSVLibraryVersion: sealed::Sealed {}
|
||||||
|
|
||||||
|
pub struct V1_40_13 {}
|
||||||
|
impl sealed::Sealed for V1_40_13 {}
|
||||||
|
impl SSVLibraryVersion for V1_40_13 {}
|
||||||
|
|
||||||
|
pub struct V1_40_14 {}
|
||||||
|
impl sealed::Sealed for V1_40_14 {}
|
||||||
|
impl SSVLibraryVersion for V1_40_14 {}
|
||||||
|
|
||||||
|
pub struct SSVLibrary<Version: SSVLibraryVersion> {
|
||||||
|
_version: PhantomData<Version>,
|
||||||
library: libloading::Library,
|
library: libloading::Library,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl<Version: SSVLibraryVersion> SSVLibraryCommon for SSVLibrary<Version> {
|
||||||
|
fn new(path: &str) -> Result<Self, Error> {
|
||||||
|
let library = unsafe { libloading::Library::new(path)?};
|
||||||
|
Ok(Self {
|
||||||
|
_version: PhantomData,
|
||||||
|
library
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl SSVLibrary<V1_40_14> {
|
||||||
|
pub fn library(&self) -> &libloading::Library {
|
||||||
|
&self.library
|
||||||
|
}
|
||||||
|
|
||||||
|
ssv_function!(BINDINGS_V1_40_14::SSV_InitLIB2, ssv_init_lib2, {
|
||||||
|
pcFichierSesam: *const i8
|
||||||
|
});
|
||||||
|
|
||||||
|
ssv_function!(BINDINGS_V1_40_14::SSV_LireConfig, ssv_lire_config, {
|
||||||
|
pZDataOut: *mut *mut libc::c_void,
|
||||||
|
psTailleDataOut: *mut usize
|
||||||
|
});
|
||||||
|
|
||||||
|
ssv_function!(BINDINGS_V1_40_14::SSV_LireCartePS, ssv_lire_carte_ps, {
|
||||||
|
NomRessourcePS: *const i8,
|
||||||
|
NomRessourceLecteur: *const i8,
|
||||||
|
CodePorteurPS: *const i8,
|
||||||
|
pZDataOut: *mut *mut libc::c_void,
|
||||||
|
pTailleZone: *mut usize
|
||||||
|
});
|
||||||
|
|
||||||
|
ssv_function!(BINDINGS_V1_40_14::SSV_LireDroitsVitale, ssv_lire_droits_vitale, {
|
||||||
|
NomRessourcePS: *const i8,
|
||||||
|
NomRessourceLecteur: *const i8,
|
||||||
|
CodePorteurPS: *const i8,
|
||||||
|
DateConsultation: *const i8,
|
||||||
|
pZDataOut: *mut *mut libc::c_void,
|
||||||
|
pTailleZone: *mut usize
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
impl SSVLibrary<V1_40_13> {
|
||||||
|
ssv_function!(BINDINGS_V1_40_13::SSV_InitLIB2, ssv_init_lib2, {
|
||||||
|
pcFichierSesam: *const i8
|
||||||
|
});
|
||||||
|
|
||||||
|
ssv_function!(BINDINGS_V1_40_13::SSV_LireConfig, ssv_lire_config, {
|
||||||
|
pZDataOut: *mut *mut libc::c_void,
|
||||||
|
psTailleDataOut: *mut usize
|
||||||
|
});
|
||||||
|
|
||||||
|
ssv_function!(BINDINGS_V1_40_13::SSV_LireCartePS, ssv_lire_carte_ps, {
|
||||||
|
NomRessourcePS: *const i8,
|
||||||
|
NomRessourceLecteur: *const i8,
|
||||||
|
CodePorteurPS: *const i8,
|
||||||
|
pZDataOut: *mut *mut libc::c_void,
|
||||||
|
pTailleZone: *mut usize
|
||||||
|
});
|
||||||
|
|
||||||
|
ssv_function!(BINDINGS_V1_40_13::SSV_LireDroitsVitale, ssv_lire_droits_vitale, {
|
||||||
|
NomRessourcePS: *const i8,
|
||||||
|
NomRessourceLecteur: *const i8,
|
||||||
|
CodePorteurPS: *const i8,
|
||||||
|
DateConsultation: *const i8,
|
||||||
|
pZDataOut: *mut *mut libc::c_void,
|
||||||
|
pTailleZone: *mut usize
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn get_library_path(version: &SupportedFsvVersion) -> String {
|
||||||
|
let root_path = get_library_root_path();
|
||||||
|
let library_name = get_library_name();
|
||||||
|
let version = version.as_str();
|
||||||
|
format!("{root_path}/{version}/lib/{library_name}")
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn sesam_ini_path(version: &SupportedFsvVersion) -> String {
|
||||||
|
let root_path = get_sesam_ini_root_path();
|
||||||
|
let version = version.as_str();
|
||||||
|
format!("{root_path}/{version}/conf/sesam.ini")
|
||||||
|
}
|
||||||
|
|
||||||
fn get_library_name() -> &'static str {
|
fn get_library_name() -> &'static str {
|
||||||
// TODO : Use libloading::library_filename to get platform-specific filename ?
|
// TODO : Use libloading::library_filename to get platform-specific filename ?
|
||||||
"libssvlux64.so"
|
"libssvlux64.so"
|
||||||
@ -73,85 +174,45 @@ fn get_sesam_ini_root_path() -> &'static str {
|
|||||||
"/etc/opt/santesocial/fsv"
|
"/etc/opt/santesocial/fsv"
|
||||||
}
|
}
|
||||||
|
|
||||||
impl SSVLibrary {
|
|
||||||
pub fn new(version: SUPPORTED_FSV_VERSIONS) -> Result<Self, Error> {
|
|
||||||
let library_path = Self::get_library_path(&version);
|
|
||||||
let library = unsafe { libloading::Library::new(library_path)? };
|
|
||||||
Ok(SSVLibrary { version, library })
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn library(&self) -> &libloading::Library {
|
|
||||||
&self.library
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn sesam_ini_path(&self) -> String {
|
|
||||||
let root_path = get_sesam_ini_root_path();
|
|
||||||
let version = self.version.as_str();
|
|
||||||
format!("{root_path}/{version}/conf/sesam.ini")
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn get_library_path(version: &SUPPORTED_FSV_VERSIONS) -> String {
|
|
||||||
let root_path = get_library_root_path();
|
|
||||||
let library_name = get_library_name();
|
|
||||||
let version = version.as_str();
|
|
||||||
format!("{root_path}/{version}/lib/{library_name}")
|
|
||||||
}
|
|
||||||
|
|
||||||
ssv_function!(SSV_InitLIB2, ssv_init_lib2, {
|
|
||||||
pcFichierSesam: *const i8
|
|
||||||
});
|
|
||||||
|
|
||||||
ssv_function!(SSV_LireConfig, ssv_lire_config, {
|
|
||||||
pZDataOut: *mut *mut libc::c_void,
|
|
||||||
psTailleDataOut: *mut usize
|
|
||||||
});
|
|
||||||
|
|
||||||
ssv_function!(SSV_LireCartePS, ssv_lire_carte_ps, {
|
|
||||||
NomRessourcePS: *const i8,
|
|
||||||
NomRessourceLecteur: *const i8,
|
|
||||||
CodePorteurPS: *const i8,
|
|
||||||
pZDataOut: *mut *mut libc::c_void,
|
|
||||||
pTailleZone: *mut usize
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod test {
|
mod test {
|
||||||
use std::{ffi::CString, ptr};
|
use std::{ffi::CString, ptr};
|
||||||
|
|
||||||
use super::*;
|
use super::*;
|
||||||
|
|
||||||
#[test]
|
mod common {
|
||||||
fn test_initlib2() {
|
use super::*;
|
||||||
let ssv_library =
|
|
||||||
SSVLibrary::new(SUPPORTED_FSV_VERSIONS::V1_40_13).expect("SSVLibrary::new failed");
|
const CPS_READER_NAME: &str = "Gemalto PC Twin Reader (645D94C3) 00 00";
|
||||||
|
const CPS_PIN: &str = "1234";
|
||||||
|
const VITALE_READER_NAME: &str = "XXXXXX";
|
||||||
|
|
||||||
|
pub fn init_library() -> SSVLibrary<V1_40_13> {
|
||||||
|
let lib_path = &get_library_path(&SupportedFsvVersion::V1_40_13);
|
||||||
|
let ssv_library = SSVLibrary::<V1_40_13>::new(lib_path).expect("SSVLibrary::new failed");
|
||||||
|
|
||||||
let sesam_ini_str =
|
let sesam_ini_str =
|
||||||
CString::new(ssv_library.sesam_ini_path()).expect("CString::new failed");
|
CString::new(sesam_ini_path(&SupportedFsvVersion::V1_40_13)).expect("CString::new failed");
|
||||||
let result = unsafe { ssv_library.ssv_init_lib2(sesam_ini_str.as_ptr()) }.unwrap();
|
let result = unsafe { ssv_library.ssv_init_lib2(sesam_ini_str.as_ptr()) }.unwrap();
|
||||||
assert_eq!(result, 0);
|
assert_eq!(result, 0);
|
||||||
|
|
||||||
|
ssv_library
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
pub fn lire_config(ssv_library: &SSVLibrary<V1_40_13>) {
|
||||||
fn test_lire_config_and_carte_ps() {
|
|
||||||
let ssv_library =
|
|
||||||
SSVLibrary::new(SUPPORTED_FSV_VERSIONS::V1_40_13).expect("SSVLibrary::new failed");
|
|
||||||
|
|
||||||
let sesam_ini_str =
|
|
||||||
CString::new(ssv_library.sesam_ini_path()).expect("CString::new failed");
|
|
||||||
let result = unsafe { ssv_library.ssv_init_lib2(sesam_ini_str.as_ptr()) }.unwrap();
|
|
||||||
assert_eq!(result, 0);
|
|
||||||
|
|
||||||
let mut buffer_ptr: *mut libc::c_void = ptr::null_mut();
|
let mut buffer_ptr: *mut libc::c_void = ptr::null_mut();
|
||||||
let mut size: libc::size_t = 0;
|
let mut size: libc::size_t = 0;
|
||||||
let result = unsafe { ssv_library.ssv_lire_config(&mut buffer_ptr, &mut size) }.unwrap();
|
let result = unsafe { ssv_library.ssv_lire_config(&mut buffer_ptr, &mut size) }.unwrap();
|
||||||
assert_eq!(result, 0);
|
assert_eq!(result, 0);
|
||||||
|
unsafe { libc::free(buffer_ptr) };
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn lire_carte_ps(ssv_library: &SSVLibrary<V1_40_13>) {
|
||||||
let nom_ressource_ps =
|
let nom_ressource_ps =
|
||||||
CString::new("Gemalto PC Twin Reader (645D94C3) 00 00").expect("CString::new failed");
|
CString::new(CPS_READER_NAME).expect("CString::new failed");
|
||||||
let nom_ressource_lecteur =
|
let nom_ressource_lecteur =
|
||||||
CString::new("Gemalto PC Twin Reader (645D94C3) 00 00").expect("CString::new failed");
|
CString::new("useless parameter").expect("CString::new failed");
|
||||||
let code_porteur_ps = CString::new("1234").expect("CString::new failed");
|
let code_porteur_ps = CString::new(CPS_PIN).expect("CString::new failed");
|
||||||
let mut buffer_ptr: *mut libc::c_void = ptr::null_mut();
|
let mut buffer_ptr: *mut libc::c_void = ptr::null_mut();
|
||||||
let mut size: libc::size_t = 0;
|
let mut size: libc::size_t = 0;
|
||||||
let result = unsafe {
|
let result = unsafe {
|
||||||
@ -162,8 +223,60 @@ mod test {
|
|||||||
&mut buffer_ptr,
|
&mut buffer_ptr,
|
||||||
&mut size,
|
&mut size,
|
||||||
)
|
)
|
||||||
}
|
}.unwrap();
|
||||||
.unwrap();
|
|
||||||
assert_eq!(result, 0);
|
assert_eq!(result, 0);
|
||||||
|
unsafe { libc::free(buffer_ptr) };
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn lire_droits_vitale(ssv_library: &SSVLibrary<V1_40_13>) {
|
||||||
|
let nom_ressource_ps =
|
||||||
|
CString::new(CPS_READER_NAME).expect("CString::new failed");
|
||||||
|
let nom_ressource_lecteur =
|
||||||
|
CString::new(VITALE_READER_NAME).expect("CString::new failed");
|
||||||
|
let code_porteur_ps = CString::new(CPS_PIN).expect("CString::new failed");
|
||||||
|
// Today's date, in the format YYYYMMDD
|
||||||
|
let today = chrono::Local::now().format("%Y%m%d").to_string();
|
||||||
|
let date_consultation = CString::new(today).expect("CString::new failed");
|
||||||
|
let mut buffer_ptr: *mut libc::c_void = ptr::null_mut();
|
||||||
|
let mut size: libc::size_t = 0;
|
||||||
|
|
||||||
|
let result = unsafe {
|
||||||
|
ssv_library.ssv_lire_droits_vitale(
|
||||||
|
nom_ressource_ps.as_ptr(),
|
||||||
|
nom_ressource_lecteur.as_ptr(),
|
||||||
|
code_porteur_ps.as_ptr(),
|
||||||
|
date_consultation.as_ptr(),
|
||||||
|
&mut buffer_ptr,
|
||||||
|
&mut size,
|
||||||
|
)
|
||||||
|
}.unwrap();
|
||||||
|
assert_eq!(result, 0);
|
||||||
|
unsafe { libc::free(buffer_ptr) };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_initlib2() {
|
||||||
|
let _ssv_library = common::init_library();
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_lire_config() {
|
||||||
|
let ssv_library = common::init_library();
|
||||||
|
common::lire_config(&ssv_library);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
#[ignore="This test requires a CPS card to be inserted in the reader"]
|
||||||
|
fn test_lire_carte_ps() {
|
||||||
|
let ssv_library = common::init_library();
|
||||||
|
common::lire_carte_ps(&ssv_library);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
#[ignore="This test requires a CPS card and a Vitale card to be inserted in the readers"]
|
||||||
|
fn test_lire_droits_vitale() {
|
||||||
|
let ssv_library = common::init_library();
|
||||||
|
common::lire_droits_vitale(&ssv_library);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
29
crates/fsv/Cargo.toml
Normal file
29
crates/fsv/Cargo.toml
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
[package]
|
||||||
|
name = "fsv"
|
||||||
|
version = "0.1.0"
|
||||||
|
edition = "2021"
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
anyhow = "1.0.89"
|
||||||
|
libc = "0.2.159"
|
||||||
|
num_enum = { version = "0.7.3", features = ["complex-expressions"] }
|
||||||
|
deku = { version = "0.18.1", features = ["logging"] }
|
||||||
|
|
||||||
|
thiserror.workspace = true
|
||||||
|
serde.workspace = true
|
||||||
|
|
||||||
|
fsv-sys = { path = "../fsv-sys" }
|
||||||
|
utils = { path = "../utils" }
|
||||||
|
|
||||||
|
#[dev-dependencies]
|
||||||
|
log = "0.4.22"
|
||||||
|
env_logger = "0.11.5"
|
||||||
|
chrono = "0.4.38"
|
||||||
|
|
||||||
|
[dev-dependencies]
|
||||||
|
insta = "1.40.0"
|
||||||
|
|
||||||
|
[profile.dev.package]
|
||||||
|
# Optimize insta (snapshot testing library) for faster compile times
|
||||||
|
insta.opt-level = 3
|
||||||
|
similar.opt-level = 3
|
238
crates/fsv/src/fsv_parsing/blocks.rs
Normal file
238
crates/fsv/src/fsv_parsing/blocks.rs
Normal file
@ -0,0 +1,238 @@
|
|||||||
|
use deku::deku_derive;
|
||||||
|
|
||||||
|
use super::{ groups, size_read, read_with_size };
|
||||||
|
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
/// # Data: FSV data structure
|
||||||
|
/// This structure is the core structure to read FSV raw data
|
||||||
|
/// It handles directly the raw data returned by the FSV library
|
||||||
|
/// A `Data` structure is composed of multiple `DataBlock` structures
|
||||||
|
pub struct Data {
|
||||||
|
#[deku(read_all)]
|
||||||
|
pub blocks: Vec<DataBlock>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
/// # Data block structure
|
||||||
|
/// The `DataBlock` are the main structures inside a `Data` struct
|
||||||
|
pub struct DataBlock {
|
||||||
|
pub header: BlockHeader,
|
||||||
|
#[deku(ctx = "header.group_id.0, header.data_size")]
|
||||||
|
pub content: DataGroup,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
/// # Block header structure
|
||||||
|
/// The `BlockHeader` structure is the header of a `DataBlock`
|
||||||
|
/// It contains the group ID and the size of the `DataBlock` contained data (`inner` field)
|
||||||
|
pub struct BlockHeader {
|
||||||
|
|
||||||
|
pub group_id: GroupId,
|
||||||
|
#[deku(reader = "size_read(deku::reader)")]
|
||||||
|
pub data_size: u64,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
/// # Group ID
|
||||||
|
/// Allow to identify the type of data contained in a `DataBlock`
|
||||||
|
/// It is use as matching ID in the `DataGroup` enum. All the
|
||||||
|
/// IDs are documented on the SSV documentation, pages 23-28
|
||||||
|
pub struct GroupId(
|
||||||
|
#[deku(endian="big", bytes= 2)]
|
||||||
|
pub u16,
|
||||||
|
);
|
||||||
|
|
||||||
|
/// # Data group enum
|
||||||
|
/// This enum is used to match a `DataBlock` content with the
|
||||||
|
/// correct data structure, able to parse the data contained in
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
#[deku(ctx = "group_id: u16, data_size: u64", id = "group_id")]
|
||||||
|
#[allow(non_camel_case_types)]
|
||||||
|
pub enum DataGroup {
|
||||||
|
#[deku(id = 1)]
|
||||||
|
LireCartePS_Group1_Holder(
|
||||||
|
#[deku(reader = "read_with_size(deku::reader, data_size as usize)")]
|
||||||
|
groups::ssv_lire_carte_ps::group_1_holder::Holder),
|
||||||
|
#[deku(id = 2)]
|
||||||
|
LireCartePS_Group2_Situation(
|
||||||
|
#[deku(reader = "read_with_size(deku::reader, data_size as usize)")]
|
||||||
|
groups::ssv_lire_carte_ps::group_2_situation::Situation),
|
||||||
|
#[deku(id = 60)]
|
||||||
|
LireConfig_Group60_ConfigHeader(
|
||||||
|
#[deku(reader = "read_with_size(deku::reader, data_size as usize)")]
|
||||||
|
groups::ssv_lire_config::group_60_header_config::ConfigHeader),
|
||||||
|
#[deku(id = 61)]
|
||||||
|
LireConfig_Group61_ReaderConfig(
|
||||||
|
#[deku(reader = "read_with_size(deku::reader, data_size as usize)")]
|
||||||
|
groups::ssv_lire_config::group_61_reader_config::ReaderConfig),
|
||||||
|
#[deku(id = 64)]
|
||||||
|
LireConfig_Group64_SVComponentsConfig(
|
||||||
|
#[deku(reader = "read_with_size(deku::reader, data_size as usize)")]
|
||||||
|
groups::ssv_lire_config::group_64_sv_config::SVComponentsConfig),
|
||||||
|
#[deku(id = 67)]
|
||||||
|
LireConfig_Group67_PCSCReaderConfig(
|
||||||
|
#[deku(reader = "read_with_size(deku::reader, data_size as usize)")]
|
||||||
|
groups::ssv_lire_config::group_67_pcsc_config::PCSCReaderConfig),
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use deku::DekuContainerRead as _;
|
||||||
|
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
mod deku_testing {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
#[deku(endian = "big")]
|
||||||
|
pub struct DekuTest {
|
||||||
|
#[deku(bits = 4)]
|
||||||
|
pub a: u8,
|
||||||
|
#[deku(bits = 4)]
|
||||||
|
pub b: u8,
|
||||||
|
pub c: u16,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
#[deku(endian = "big")]
|
||||||
|
pub struct DekuTestWithSizeReader {
|
||||||
|
#[deku(bytes = 2)]
|
||||||
|
pub id: u16,
|
||||||
|
#[deku(reader = "size_read(deku::reader)")]
|
||||||
|
pub size: u64,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
pub struct DekuTestWithGroupId {
|
||||||
|
pub group_id: GroupId,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_deserialize_deku_test() {
|
||||||
|
let buffer: &[u8] = &[0b0110_1001, 0xBE, 0xEF];
|
||||||
|
let offset: usize = 0;
|
||||||
|
let ((rest, offset), val) = deku_testing::DekuTest::from_bytes((buffer, offset)).unwrap();
|
||||||
|
|
||||||
|
assert_eq!(val.a, 0b0110);
|
||||||
|
assert_eq!(val.b, 0b1001);
|
||||||
|
assert_eq!(val.c, 0xBEEF);
|
||||||
|
|
||||||
|
assert_eq!(offset, 0);
|
||||||
|
assert_eq!(rest, &[]);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_deserialize_deku_test_with_offset() {
|
||||||
|
let buffer: &[u8] = &[0b0000_1111, 0b0110_1001, 0xBE, 0xEF];
|
||||||
|
let offset: usize = 8;
|
||||||
|
let ((rest, offset), val) = deku_testing::DekuTest::from_bytes((buffer, offset)).unwrap();
|
||||||
|
|
||||||
|
assert_eq!(val.a, 0b0110);
|
||||||
|
assert_eq!(val.b, 0b1001);
|
||||||
|
assert_eq!(val.c, 0xBEEF);
|
||||||
|
|
||||||
|
assert_eq!(offset, 0);
|
||||||
|
assert_eq!(rest, &[]);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_serialize_deku_test_with_rest() {
|
||||||
|
let buffer: &[u8] = &[0b0110_1001, 0xBE, 0xEF, 0x1F, 0x2F];
|
||||||
|
let offset: usize = 0;
|
||||||
|
let ((rest, offset), val) = deku_testing::DekuTest::from_bytes((buffer, offset)).unwrap();
|
||||||
|
|
||||||
|
assert_eq!(val.a, 0b0110);
|
||||||
|
assert_eq!(val.b, 0b1001);
|
||||||
|
assert_eq!(val.c, 0xBEEF);
|
||||||
|
|
||||||
|
assert_eq!(offset, 0);
|
||||||
|
assert_eq!(rest, &[0x1F, 0x2F]);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_size_read() {
|
||||||
|
let buffer: &[u8] = &[
|
||||||
|
0, 60, // ID (60)
|
||||||
|
0b0100_0000, // Size type bit (0) + Size (64)
|
||||||
|
3, 4, 5, 6, 7, 8, 9, 10, 11, 12 // Extra data (10 bytes ; should be 64)
|
||||||
|
];
|
||||||
|
let ((rest, _offset), val) = deku_testing::DekuTestWithSizeReader::from_bytes((buffer, 0)).unwrap();
|
||||||
|
assert_eq!(val.id, 60, "EX1: ID");
|
||||||
|
assert_eq!(val.size, 64, "EX1: Size");
|
||||||
|
assert_eq!(rest.len(), 10, "EX1: Rest");
|
||||||
|
|
||||||
|
let buffer: &[u8] = &[
|
||||||
|
0, 60, // ID (60)
|
||||||
|
0b1000_0010, // Size type bit (1) + Size block length (2)
|
||||||
|
0b0000_0001, 0b0100_0000, // Size (320)
|
||||||
|
3, 4, 5, 6, 7, 8, 9, 10, 11, 12 // Extra data (10 bytes ; should be 320)
|
||||||
|
];
|
||||||
|
let ((rest, _offset), val) = deku_testing::DekuTestWithSizeReader::from_bytes((buffer, 0)).unwrap();
|
||||||
|
assert_eq!(val.id, 60, "EX2: ID");
|
||||||
|
assert_eq!(val.size, 320, "EX2: Size");
|
||||||
|
println!("{:?}", rest);
|
||||||
|
// assert_eq!(val.size, 320, "EX2: Size");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_endianness() {
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
struct DekuTest {
|
||||||
|
#[deku(endian = "big")]
|
||||||
|
field_be: u16,
|
||||||
|
#[deku(endian = "little")]
|
||||||
|
field_le: u16,
|
||||||
|
field_default: u16,
|
||||||
|
}
|
||||||
|
|
||||||
|
let buffer: &[u8] = &[
|
||||||
|
0xAB, 0xCD,
|
||||||
|
0xAB, 0xCD,
|
||||||
|
0xAB, 0xCD,
|
||||||
|
];
|
||||||
|
let (_rest, result) = DekuTest::from_bytes((buffer, 0)).unwrap();
|
||||||
|
assert_eq!(result.field_be, 0xABCD, "0xAB,0xCD - Big Endian");
|
||||||
|
assert_eq!(result.field_le, 0xCDAB, "0xAB,0xCD - Little Endian");
|
||||||
|
assert_eq!(deku::ctx::Endian::default(), deku::ctx::Endian::Little, "Default Endian");
|
||||||
|
assert_eq!(result.field_default, 0xCDAB, "0xAB,0xCD - Default Endian");
|
||||||
|
|
||||||
|
let buffer: &[u8] = &[
|
||||||
|
0, 64,
|
||||||
|
0, 64,
|
||||||
|
0, 64,
|
||||||
|
];
|
||||||
|
let (_rest, result) = DekuTest::from_bytes((buffer, 0)).unwrap();
|
||||||
|
assert_eq!(result.field_be, 64, "0,64 - Big Endian");
|
||||||
|
assert_eq!(result.field_le, 16384, "0,64 - Little Endian");
|
||||||
|
assert_eq!(deku::ctx::Endian::default(), deku::ctx::Endian::Little);
|
||||||
|
assert_eq!(result.field_default, 16384, "0,64 - Default Endian");
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_group_id() {
|
||||||
|
// env_logger::init(); // Uncomment and run with RUST_LOG=trace for deku debugging
|
||||||
|
let buffer: &[u8] = &[
|
||||||
|
0, 60, // ID (60)
|
||||||
|
];
|
||||||
|
let (_rest, val) = deku_testing::DekuTestWithGroupId::from_bytes((buffer, 0)).unwrap();
|
||||||
|
assert_eq!(val.group_id.0, 60, "EX1: ID");
|
||||||
|
|
||||||
|
let buffer: &[u8] = &[
|
||||||
|
7, 118, // ID (1910)
|
||||||
|
];
|
||||||
|
let (_rest, val) = deku_testing::DekuTestWithGroupId::from_bytes((buffer, 0)).unwrap();
|
||||||
|
assert_eq!(val.group_id.0, 1910, "EX2: ID");
|
||||||
|
}
|
||||||
|
}
|
153
crates/fsv/src/fsv_parsing/groups/mod.rs
Normal file
153
crates/fsv/src/fsv_parsing/groups/mod.rs
Normal file
@ -0,0 +1,153 @@
|
|||||||
|
use std::{fmt, str::FromStr};
|
||||||
|
|
||||||
|
use deku::{deku_derive, DekuError};
|
||||||
|
|
||||||
|
use super::{ size_read, map_bytes_to_lossy_string };
|
||||||
|
|
||||||
|
pub mod ssv_lire_carte_ps;
|
||||||
|
pub mod ssv_lire_config;
|
||||||
|
|
||||||
|
/// # Convert a DataField to a specific type
|
||||||
|
/// Using this as deku map function to fill a field value from
|
||||||
|
/// a DataField
|
||||||
|
fn map_from_data_field<T>(data_field: DataField) -> Result<T, DekuError>
|
||||||
|
where
|
||||||
|
T: FromStr,
|
||||||
|
T::Err: std::fmt::Display,
|
||||||
|
{
|
||||||
|
let text = String::from_utf8(data_field.data)
|
||||||
|
.map_err(|e| DekuError::Parse(e.to_string().into()))?;
|
||||||
|
text.parse::<T>()
|
||||||
|
.map_err(|e| DekuError::Parse(e.to_string().into()))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// # Extract raw bytes from a DataField, through a Vec<u8>
|
||||||
|
/// This function is used as deku map function to extract raw bytes
|
||||||
|
/// from a DataField
|
||||||
|
fn map_raw_from_data_field<T>(data_field: DataField) -> Result<T, DekuError>
|
||||||
|
where
|
||||||
|
T: From<Vec<u8>>,
|
||||||
|
{
|
||||||
|
Ok(data_field.data.into())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// # Extract an enum id from a string
|
||||||
|
/// Deku enums only supports numbers as id, and we usually extract strings
|
||||||
|
/// from data fields. This function is used as a context function to convert
|
||||||
|
/// a string, such as obtained with NumericString, to an enum id
|
||||||
|
pub fn extract_enum_id_from_str<T>(id_string: &str, default: T) -> T
|
||||||
|
where T: FromStr {
|
||||||
|
id_string.parse::<T>().unwrap_or(default)
|
||||||
|
}
|
||||||
|
|
||||||
|
// ------------------- DATA FIELD TYPES -------------------
|
||||||
|
|
||||||
|
/// # Data field structure
|
||||||
|
/// This structure is the core structure to read data fields
|
||||||
|
/// It is usually used by other structures implementing the
|
||||||
|
/// `#[deku(map = "map_from_data_field")]` attribute
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
struct DataField {
|
||||||
|
#[deku(temp, reader = "size_read(deku::reader)")]
|
||||||
|
pub data_size: u64,
|
||||||
|
#[deku(bytes_read = "data_size")]
|
||||||
|
pub data: Vec<u8>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
#[derive(Debug, Clone, PartialEq)]
|
||||||
|
/// # Data field: Numeric string (x CN)
|
||||||
|
/// TODO: check if all the characters are numeric
|
||||||
|
pub struct NumericString(
|
||||||
|
#[deku(map = "map_from_data_field")]
|
||||||
|
pub String
|
||||||
|
);
|
||||||
|
impl From<&str> for NumericString {
|
||||||
|
fn from(s: &str) -> Self {
|
||||||
|
NumericString(s.to_string())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
#[derive(Debug, Clone, PartialEq)]
|
||||||
|
/// # Data field: Alphanumeric string (x CA/CE)
|
||||||
|
pub struct AlphaNumericString(
|
||||||
|
#[deku(map = "map_from_data_field")]
|
||||||
|
pub String
|
||||||
|
);
|
||||||
|
impl From<&str> for AlphaNumericString {
|
||||||
|
fn from(s: &str) -> Self {
|
||||||
|
AlphaNumericString(s.to_string())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
#[derive(Debug, Clone, PartialEq)]
|
||||||
|
/// # Data field: Raw bytes (x CB)
|
||||||
|
pub struct RawBytes(
|
||||||
|
#[deku(map = "map_raw_from_data_field")]
|
||||||
|
pub Vec<u8>
|
||||||
|
);
|
||||||
|
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
#[derive(Debug, Clone, PartialEq)]
|
||||||
|
/// # Data field: Raw byte (1 CB)
|
||||||
|
pub struct RawByte(
|
||||||
|
#[deku(map = "|x: DataField| -> Result<u8, DekuError> { Ok(x.data[0]) }")]
|
||||||
|
pub u8
|
||||||
|
);
|
||||||
|
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
#[derive(Debug, Clone, PartialEq)]
|
||||||
|
#[deku(endian = "big")]
|
||||||
|
/// # Software version
|
||||||
|
/// An almost standard software version structure in FSV
|
||||||
|
/// It is composed of a version and a revision, encoded on 2 bytes each
|
||||||
|
pub struct SoftwareVersion {
|
||||||
|
#[deku(temp, reader = "size_read(deku::reader)", assert_eq = "4")]
|
||||||
|
data_size: u64,
|
||||||
|
#[deku(bytes= 2, map = "|x: [u8; 2]| map_bytes_to_lossy_string(&x)")]
|
||||||
|
pub version: String,
|
||||||
|
#[deku(bytes= 2, map = "|x: [u8; 2]| map_bytes_to_lossy_string(&x)")]
|
||||||
|
pub revision: String,
|
||||||
|
}
|
||||||
|
impl fmt::Display for SoftwareVersion {
|
||||||
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||||
|
write!(f, "{}.{}", self.version, self.revision)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod test {
|
||||||
|
use deku::DekuContainerRead as _;
|
||||||
|
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test() {
|
||||||
|
let version_bytes: [u8; 2] = [48, 55];
|
||||||
|
let version = map_bytes_to_lossy_string(&version_bytes).unwrap();
|
||||||
|
assert_eq!(version, "07");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_software_version() {
|
||||||
|
// env_logger::init(); // Uncomment and run with RUST_LOG=trace for deku debugging
|
||||||
|
let data: [u8; 5] = [4, 48, 55, 50, 48];
|
||||||
|
|
||||||
|
let (_rest, software_version) = SoftwareVersion::from_bytes((&data, 0)).unwrap();
|
||||||
|
// assert_eq!(software_version.data_size, 4);
|
||||||
|
assert_eq!(software_version.version, "07");
|
||||||
|
assert_eq!(software_version.revision, "20");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_map_from_data_field() {
|
||||||
|
let data_field = DataField {
|
||||||
|
data: vec![48, 55],
|
||||||
|
};
|
||||||
|
let id: u8 = map_from_data_field(data_field).unwrap();
|
||||||
|
assert_eq!(id, 7);
|
||||||
|
}
|
||||||
|
}
|
733
crates/fsv/src/fsv_parsing/groups/ssv_lire_carte_ps.rs
Normal file
733
crates/fsv/src/fsv_parsing/groups/ssv_lire_carte_ps.rs
Normal file
@ -0,0 +1,733 @@
|
|||||||
|
//! # Structures de parsing des données de la fonction SSV_LireCartePS
|
||||||
|
#![allow(clippy::explicit_auto_deref)] // False positive on ctx attributes when using extract_enum_id_from_str
|
||||||
|
|
||||||
|
use deku::deku_derive;
|
||||||
|
|
||||||
|
use crate::fsv_parsing::groups::{ extract_enum_id_from_str, AlphaNumericString, NumericString, RawByte };
|
||||||
|
|
||||||
|
/// # Titulaire
|
||||||
|
/// 1 occurence
|
||||||
|
pub mod group_1_holder {
|
||||||
|
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
/// Groupe 1 - Titulaire
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
pub struct Holder {
|
||||||
|
#[deku(temp)]
|
||||||
|
card_type_raw: NumericString, // Champ 1 : Type de carte PS (2 CN)
|
||||||
|
#[deku(ctx = "extract_enum_id_from_str::<u8>(&*card_type_raw.0, 255)")]
|
||||||
|
pub card_type: CardPSType,
|
||||||
|
#[deku(temp)]
|
||||||
|
national_id_type_raw: NumericString, // Champ 2 : Type d’identification nationale (1 CN)
|
||||||
|
#[deku(ctx = "extract_enum_id_from_str::<u8>(&*national_id_type_raw.0, 255)")]
|
||||||
|
pub national_id_type: NationalIDType,
|
||||||
|
// TODO: handle national_id depending on national_id_type
|
||||||
|
pub national_id: AlphaNumericString, // /!\ CE and not CA - Champ 3 : N° d’identification nationale (8-30 CE)
|
||||||
|
pub national_id_key: AlphaNumericString, // Champ 4 : Clé du N° d’identification nationale (1 CN)
|
||||||
|
#[deku(temp)]
|
||||||
|
civility_code_raw: NumericString, // Champ 5 : Code civilité (2 CN)
|
||||||
|
#[deku(ctx = "extract_enum_id_from_str::<u8>(&*civility_code_raw.0, 255)")]
|
||||||
|
pub civility_code: CivilityCode,
|
||||||
|
pub holder_lastname: AlphaNumericString, // /!\ CE and not CA - Champ 6 : Nom du PS (27 CE)
|
||||||
|
pub holder_firstname: AlphaNumericString, // /!\ CE and not CA - Champ 7 : Prénom du PS (27 CE)
|
||||||
|
#[deku(temp)]
|
||||||
|
category_card_size: u8, // Champ 8 : Catégorie Carte (1 CA)
|
||||||
|
pub category_card: CategoryCard,
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fields
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
#[deku(ctx = "id: u8", id = "id")]
|
||||||
|
pub enum CardPSType {
|
||||||
|
#[deku(id = 0)]
|
||||||
|
CPS, // Carte de Professionnel de Santé (CPS)
|
||||||
|
#[deku(id = 1)]
|
||||||
|
CPF, // Carte de Professionnel de Santé en Formation (CPF)
|
||||||
|
#[deku(id = 2)]
|
||||||
|
CPE, // Carte de Personnel / Directeur⋅ice d'Établissement de Santé (CDE/CPE)
|
||||||
|
#[deku(id = 3)]
|
||||||
|
CPA, // Carte de Personnel / Directeur⋅ice Autorisé⋅e (CDA/CPA)
|
||||||
|
#[deku(id = 4)]
|
||||||
|
CPM, // Carte de Personne Morale
|
||||||
|
}
|
||||||
|
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
#[deku(ctx = "id: u8", id = "id")]
|
||||||
|
pub enum NationalIDType {
|
||||||
|
#[deku(id = 0)]
|
||||||
|
ADELI, // N° ADELI
|
||||||
|
#[deku(id = 1)]
|
||||||
|
ADELICabinet, // Id Cabinet ADELI + N° employé
|
||||||
|
#[deku(id = 2)]
|
||||||
|
DRASS, // N° DRASS
|
||||||
|
#[deku(id = 3)]
|
||||||
|
FINESS, // N° FINESS + N° employé
|
||||||
|
#[deku(id = 4)]
|
||||||
|
SIREN, // N° SIREN + N° employé
|
||||||
|
#[deku(id = 5)]
|
||||||
|
SIRET, // N° SIRET + N° employé
|
||||||
|
#[deku(id = 6)]
|
||||||
|
RPPSCabinet, // Id Cabinet RPPS + N° employé
|
||||||
|
#[deku(id = 8)]
|
||||||
|
RPPS, // N° RPPS
|
||||||
|
#[deku(id = 9)]
|
||||||
|
ADELIEtudiantMedecin, // N° Etudiant Médecin type ADELI sur 9 caractères (information transmise par l’ANS)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
#[deku(ctx = "id: u8", id = "id")]
|
||||||
|
pub enum CivilityCode {
|
||||||
|
#[deku(id = 1)]
|
||||||
|
Adjudant,
|
||||||
|
#[deku(id = 2)]
|
||||||
|
Amiral,
|
||||||
|
#[deku(id = 3)]
|
||||||
|
Aspirant,
|
||||||
|
#[deku(id = 4)]
|
||||||
|
Aumonier,
|
||||||
|
#[deku(id = 5)]
|
||||||
|
Capitaine,
|
||||||
|
#[deku(id = 6)]
|
||||||
|
Cardinal,
|
||||||
|
#[deku(id = 7)]
|
||||||
|
Chanoine,
|
||||||
|
#[deku(id = 8)]
|
||||||
|
Colonel,
|
||||||
|
#[deku(id = 9)]
|
||||||
|
Commandant,
|
||||||
|
#[deku(id = 10)]
|
||||||
|
Commissaire,
|
||||||
|
#[deku(id = 11)]
|
||||||
|
Conseiller,
|
||||||
|
#[deku(id = 12)]
|
||||||
|
Directeur,
|
||||||
|
#[deku(id = 13)]
|
||||||
|
Docteur,
|
||||||
|
#[deku(id = 14)]
|
||||||
|
Douanier,
|
||||||
|
#[deku(id = 15)]
|
||||||
|
Epouxse,
|
||||||
|
#[deku(id = 16)]
|
||||||
|
Eveque,
|
||||||
|
#[deku(id = 17)]
|
||||||
|
General,
|
||||||
|
#[deku(id = 18)]
|
||||||
|
Gouverneur,
|
||||||
|
#[deku(id = 19)]
|
||||||
|
Ingenieur,
|
||||||
|
#[deku(id = 20)]
|
||||||
|
Inspecteur,
|
||||||
|
#[deku(id = 21)]
|
||||||
|
Lieutenant,
|
||||||
|
#[deku(id = 22)]
|
||||||
|
Madame,
|
||||||
|
#[deku(id = 23)]
|
||||||
|
Mademoiselle,
|
||||||
|
#[deku(id = 24)]
|
||||||
|
Maitre,
|
||||||
|
#[deku(id = 25)]
|
||||||
|
Marechal,
|
||||||
|
#[deku(id = 26)]
|
||||||
|
Medecin,
|
||||||
|
#[deku(id = 27)]
|
||||||
|
Mesdames,
|
||||||
|
#[deku(id = 28)]
|
||||||
|
Mesdemoiselles,
|
||||||
|
#[deku(id = 29)]
|
||||||
|
Messieurs,
|
||||||
|
#[deku(id = 30)]
|
||||||
|
Monseigneur,
|
||||||
|
#[deku(id = 31)]
|
||||||
|
Monsieur,
|
||||||
|
#[deku(id = 32)]
|
||||||
|
NotreDame,
|
||||||
|
#[deku(id = 33)]
|
||||||
|
Pasteur,
|
||||||
|
#[deku(id = 34)]
|
||||||
|
Prefet,
|
||||||
|
#[deku(id = 35)]
|
||||||
|
President,
|
||||||
|
#[deku(id = 36)]
|
||||||
|
Professeur,
|
||||||
|
#[deku(id = 37)]
|
||||||
|
Recteur,
|
||||||
|
#[deku(id = 38)]
|
||||||
|
Sergent,
|
||||||
|
#[deku(id = 39)]
|
||||||
|
SousPrefet,
|
||||||
|
#[deku(id = 40)]
|
||||||
|
Technicien,
|
||||||
|
#[deku(id = 41)]
|
||||||
|
Veuve,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
#[deku(id_type="u8")]
|
||||||
|
pub enum CategoryCard {
|
||||||
|
#[deku(id = 74)] // T
|
||||||
|
Test,
|
||||||
|
#[deku(id = 72)] // R
|
||||||
|
Reelle,
|
||||||
|
#[deku(id_pat = "_")]
|
||||||
|
Unknown,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// # Situation
|
||||||
|
/// 1-16 occurences
|
||||||
|
pub mod group_2_situation {
|
||||||
|
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
/// Groupe 2 - Situation du PS
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
pub struct Situation {
|
||||||
|
pub id: RawByte, // Champ 1 : N° logique de la situation de facturation du PS (1 CB)
|
||||||
|
#[deku(temp)]
|
||||||
|
practice_mode_raw: NumericString, // Champ 2 : Mode d’exercice (2 CN)
|
||||||
|
#[deku(ctx = "extract_enum_id_from_str::<u8>(&*practice_mode_raw.0, 255)")]
|
||||||
|
pub practice_mode: PracticeMode,
|
||||||
|
// #[deku(temp)]
|
||||||
|
pub practice_status_raw: NumericString, // Champ 3 : Statut d’exercice (3 CN)
|
||||||
|
// #[deku(ctx = "extract_enum_id_from_str::<u8>(&*practice_status_raw.0, 255)")]
|
||||||
|
// pub practice_status: PracticeStatus,
|
||||||
|
#[deku(temp)]
|
||||||
|
activity_sector_raw: NumericString, // Champ 4 : Secteur d’activité (3 CN)
|
||||||
|
#[deku(ctx = "extract_enum_id_from_str::<u8>(&*activity_sector_raw.0, 255)")]
|
||||||
|
pub activity_sector: ActivitySector,
|
||||||
|
#[deku(temp)]
|
||||||
|
structure_id_type_raw: NumericString, // Champ 5 : Type d’identification structure (1 CN)
|
||||||
|
#[deku(ctx = "extract_enum_id_from_str::<u8>(&*structure_id_type_raw.0, 255)")]
|
||||||
|
pub structure_id_type: StructureIDType,
|
||||||
|
pub structure_id: AlphaNumericString, // Champ 6 : N° d’identification structure (14 CA)
|
||||||
|
pub structure_id_key: NumericString, // Champ 7 : Clé du n° d’identification structure (1 CN)
|
||||||
|
pub structure_name: AlphaNumericString, // Champ 8 : Raison sociale structure (40 CE)
|
||||||
|
pub ps_billing_number: NumericString, // Champ 9 : N° d’identification de facturation du PS (8 CN)
|
||||||
|
pub ps_billing_number_key: NumericString, // Champ 10 : Clé du n° d’identification de facturation du PS (1 CN)
|
||||||
|
pub ps_replacement_number: AlphaNumericString, // Champ 11 : N° d’identification du PS remplaçant (30 CA) -- TODO OPTIONNEL
|
||||||
|
pub ps_replacement_number_key: NumericString, // Champ 12 : Clé du n° d’identification du PS remplaçant (1 CN) -- TODO OPTIONNEL
|
||||||
|
#[deku(temp)]
|
||||||
|
convention_code_raw: NumericString, // Champ 13 : Code conventionnel (1 CN)
|
||||||
|
#[deku(ctx = "extract_enum_id_from_str::<u8>(&*convention_code_raw.0, 255)")]
|
||||||
|
pub convention_code: ConventionCode,
|
||||||
|
#[deku(temp)]
|
||||||
|
specialty_code_raw: NumericString, // Champ 14 : Code spécialité (2 CN)
|
||||||
|
#[deku(ctx = "extract_enum_id_from_str::<u8>(&*specialty_code_raw.0, 255)")]
|
||||||
|
pub specialty_code: SpecialtyCode,
|
||||||
|
// #[deku(temp)]
|
||||||
|
pub rate_zone_code_raw: NumericString, // Champ 15 : Code zone tarifaire (2 CN)
|
||||||
|
// #[deku(ctx = "extract_enum_id_from_str::<u8>(&*rate_zone_code_raw.0, 255)")]
|
||||||
|
// pub rate_zone_code: RateZoneCode, // CF p53-55 - Attribution complexe, dépendant du practice_status, du specialty_code et du convention_code
|
||||||
|
#[deku(temp)]
|
||||||
|
ik_zone_code_raw: NumericString, // Champ 16 : Code zone IK - Indemnité kilométrique (2 CN)
|
||||||
|
#[deku(ctx = "extract_enum_id_from_str::<u8>(&*ik_zone_code_raw.0, 255)")]
|
||||||
|
pub ik_zone_code: IkZoneCode,
|
||||||
|
#[deku(temp)]
|
||||||
|
approval_code_1_raw: NumericString, // Champ 17 : Code agrément 1 (1 CN)
|
||||||
|
#[deku(ctx = "extract_enum_id_from_str::<u8>(&*approval_code_1_raw.0, 255)")]
|
||||||
|
pub approval_code_1: ApprovalCode,
|
||||||
|
pub approval_code_2_raw: NumericString, // Champ 18 : Code agrément 2 (1 CN) - Non utilisé pour le moment
|
||||||
|
pub approval_code_3_raw: NumericString, // Champ 19 : Code agrément 3 (1 CN) - Non utilisé pour le moment
|
||||||
|
pub invoice_signature_permission: NumericString, // Champ 20 : Habilitation à signer une facture (1 CN)
|
||||||
|
pub lot_signature_permission: NumericString, // Champ 21 : Habilitation à signer un lot (1 CN)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fields
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
#[deku(ctx = "id: u8", id = "id")]
|
||||||
|
/// Mode d'exercice
|
||||||
|
pub enum PracticeMode {
|
||||||
|
#[deku(id = 0)]
|
||||||
|
Liberal, // Libéral, exploitant, commerçant
|
||||||
|
#[deku(id = 1)]
|
||||||
|
Salarie,
|
||||||
|
#[deku(id = 4)]
|
||||||
|
Remplacant,
|
||||||
|
#[deku(id = 7)]
|
||||||
|
Benevole,
|
||||||
|
}
|
||||||
|
//
|
||||||
|
// #[deku_derive(DekuRead)]
|
||||||
|
// #[derive(Debug, PartialEq)]
|
||||||
|
// #[deku(ctx = "id: u8", id = "id")]
|
||||||
|
// /// Statut d'exercice
|
||||||
|
// pub enum PracticeStatus {
|
||||||
|
// // Cf. TAB-Statuts géré par l’ANS
|
||||||
|
// }
|
||||||
|
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
#[deku(ctx = "id: u8", id = "id")]
|
||||||
|
/// Secteur d'activité
|
||||||
|
pub enum ActivitySector {
|
||||||
|
#[deku(id = 10)]
|
||||||
|
EtablissementPublicDeSante, // Etablissement Public de santé
|
||||||
|
#[deku(id = 11)]
|
||||||
|
HopitauxMilitaires, // Hôpitaux Militaires
|
||||||
|
#[deku(id = 16)]
|
||||||
|
EtablissementPrivePSPH, // Etablissement Privé PSPH
|
||||||
|
#[deku(id = 17)]
|
||||||
|
EtablissementPriveNonPSPH, // Etablissement Privé Non PSPH
|
||||||
|
#[deku(id = 25)]
|
||||||
|
DispensaireDeSoins, // Dispensaire de soins
|
||||||
|
#[deku(id = 26)]
|
||||||
|
AutresStructuresDeSoinsArmee, // Autres structures de soins relevant du Service de santé des armées
|
||||||
|
#[deku(id = 31)]
|
||||||
|
CabinetIndividuel, // Cabinet individuel
|
||||||
|
#[deku(id = 32)]
|
||||||
|
CabinetDeGroupe, // Cabinet de Groupe
|
||||||
|
#[deku(id = 33)]
|
||||||
|
ExerciceEnSociete, // Exercice en Société
|
||||||
|
#[deku(id = 34)]
|
||||||
|
SecteurPrivePHTempsPlein, // Secteur privé PH temps plein
|
||||||
|
#[deku(id = 35)]
|
||||||
|
TransportSanitaire, // Transport sanitaire
|
||||||
|
#[deku(id = 37)]
|
||||||
|
EntrepriseDInterim, // Entreprise d'intérim
|
||||||
|
#[deku(id = 41)]
|
||||||
|
EtablissementDeSoinsEtPrevention, // Etablissement de Soins et Prévention
|
||||||
|
#[deku(id = 42)]
|
||||||
|
PreventionEtSoinsEnEntreprise, // Prévention. Et Soins en Entreprise
|
||||||
|
#[deku(id = 43)]
|
||||||
|
SanteScolaireEtUniversitaire, // Santé scolaire & universitaire
|
||||||
|
#[deku(id = 44)]
|
||||||
|
RecrutementEtGestionRH, // Recrutement & gestion RH
|
||||||
|
#[deku(id = 45)]
|
||||||
|
PMIPlanificationFamiliale, // P.M.I. Planification familiale
|
||||||
|
#[deku(id = 51)]
|
||||||
|
EtablissementPourHandicapes, // Etablissement pour Handicapés
|
||||||
|
#[deku(id = 52)]
|
||||||
|
ComMarketingConsultingMedia, // Com/Marketing/Consulting/Media
|
||||||
|
#[deku(id = 53)]
|
||||||
|
EtablissementPersonnesAgees, // Etablissement Personnes Agées
|
||||||
|
#[deku(id = 54)]
|
||||||
|
EtablissementAideALaFamille, // Etablissement Aide à la famille
|
||||||
|
#[deku(id = 55)]
|
||||||
|
EtablissementDEnseignement, // Etablissement d'enseignement
|
||||||
|
#[deku(id = 56)]
|
||||||
|
EtablissementsDeProtectionDeLEnfance, // Etablissements de protection de l'enfance
|
||||||
|
#[deku(id = 57)]
|
||||||
|
EtablissementsDHebergementEtDeReadaptation, // Etablissements d'hébergement et de réadaptation
|
||||||
|
#[deku(id = 58)]
|
||||||
|
Recherche, // Recherche
|
||||||
|
#[deku(id = 61)]
|
||||||
|
AssurancePrivee, // Assurance Privée
|
||||||
|
#[deku(id = 62)]
|
||||||
|
OrganismeDeSecuriteSociale, // Organisme de Sécurité Sociale
|
||||||
|
#[deku(id = 65)]
|
||||||
|
MinistereEtServicesDeconcentres, // Ministère & Serv. Déconcentrés
|
||||||
|
#[deku(id = 66)]
|
||||||
|
CollectivitesTerritoriales, // Collectivités Territoriales
|
||||||
|
#[deku(id = 68)]
|
||||||
|
AssoEtOrgaHumanitaire, // Asso et orga humanitaire
|
||||||
|
#[deku(id = 71)]
|
||||||
|
LABM, // LABM
|
||||||
|
#[deku(id = 75)]
|
||||||
|
AutreEtablissementSanitaire, // Autre établissement Sanitaire
|
||||||
|
#[deku(id = 81)]
|
||||||
|
ProdEtComGrosBienMed, // Prod. & Com. Gros Bien Med.
|
||||||
|
#[deku(id = 85)]
|
||||||
|
CommDetailDeBiensMedicaux, // Comm. Détail de biens médicaux
|
||||||
|
#[deku(id = 86)]
|
||||||
|
PharmacieDOfficine, // Pharmacie d'officine
|
||||||
|
#[deku(id = 87)]
|
||||||
|
CentreDeDialyse, // Centre de dialyse
|
||||||
|
#[deku(id = 88)]
|
||||||
|
ParaPharmacie, // Para-pharmacie
|
||||||
|
#[deku(id = 91)]
|
||||||
|
AutreSecteurDActivite, // Autre secteur d'activité
|
||||||
|
#[deku(id = 92)]
|
||||||
|
SecteurNonDefini, // Secteur non défini
|
||||||
|
#[deku(id = 93)]
|
||||||
|
CentreAntiCancer, // Centre anti-cancer
|
||||||
|
#[deku(id = 94)]
|
||||||
|
CentreDeTransfusionSanguine, // Centre de transfusion sanguine
|
||||||
|
#[deku(id = 95)]
|
||||||
|
ChaineDuMedicament, // Répart. Distrib. Fab. Exploit. Import Médicaments
|
||||||
|
#[deku(id = 96)]
|
||||||
|
IncendiesEtSecours, // Incendies et secours
|
||||||
|
#[deku(id = 97)]
|
||||||
|
EntreprisesIndustriellesNonPharma, // Entreprises industrielles et tertiaires hors industries pharmaceutiques
|
||||||
|
#[deku(id = 98)]
|
||||||
|
EntiteDUnTOM, // Entité d'un TOM
|
||||||
|
#[deku(id = 99)]
|
||||||
|
ChaineDuDispositifMedical, // Fab. Exploit. Import. Médicaments et Dispositifs Médicaux
|
||||||
|
}
|
||||||
|
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
#[deku(ctx = "id: u8", id = "id")]
|
||||||
|
/// Type d'identification structure
|
||||||
|
pub enum StructureIDType {
|
||||||
|
#[deku(id = 0)]
|
||||||
|
ADELICabinet, // Id Cabinet ADELI
|
||||||
|
#[deku(id = 1)]
|
||||||
|
FINESS, // N° FINESS
|
||||||
|
#[deku(id = 2)]
|
||||||
|
SIREN, // N° SIREN
|
||||||
|
#[deku(id = 3)]
|
||||||
|
SIRET, // N° SIRET
|
||||||
|
#[deku(id = 4)]
|
||||||
|
RPPSCabinet, // Id Cabinet RPPS
|
||||||
|
}
|
||||||
|
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
#[deku(ctx = "id: u8", id = "id")]
|
||||||
|
/// Code conventionnel
|
||||||
|
/// Dictionnaire des données FSV, p37
|
||||||
|
pub enum ConventionCode {
|
||||||
|
#[deku(id = 0)]
|
||||||
|
NonConventionne,
|
||||||
|
#[deku(id = 1)]
|
||||||
|
Conventionne,
|
||||||
|
#[deku(id = 2)]
|
||||||
|
ConventionneAvecDepassement,
|
||||||
|
#[deku(id = 3)]
|
||||||
|
ConventionneAvecHonorairesLibres,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
#[deku(ctx = "id: u8", id = "id")]
|
||||||
|
/// Code spécialité
|
||||||
|
/// Dictionnaire des données FSV, p43
|
||||||
|
pub enum SpecialtyCode {
|
||||||
|
#[deku(id = 1)]
|
||||||
|
MedecineGenerale, // Médecine générale
|
||||||
|
#[deku(id = 2)]
|
||||||
|
AnesthesieReanimation, // Anesthésie-Réanimation
|
||||||
|
#[deku(id = 3)]
|
||||||
|
Cardiologie, // Cardiologie
|
||||||
|
#[deku(id = 4)]
|
||||||
|
ChirurgieGenerale, // Chirurgie Générale
|
||||||
|
#[deku(id = 5)]
|
||||||
|
DermatoVenerologie, // Dermatologie et Vénérologie
|
||||||
|
#[deku(id = 6)]
|
||||||
|
Radiologie, // Radiologie
|
||||||
|
#[deku(id = 7)]
|
||||||
|
GynecologieObstetrique, // Gynécologie obstétrique
|
||||||
|
#[deku(id = 8)]
|
||||||
|
GastroEnterologieHepatologie, // Gastro-Entérologie et Hépatologie
|
||||||
|
#[deku(id = 9)]
|
||||||
|
MedecineInterne, // Médecine interne
|
||||||
|
#[deku(id = 10)]
|
||||||
|
NeuroChirurgie, // Neuro-Chirurgie
|
||||||
|
#[deku(id = 11)]
|
||||||
|
OtoRhinoLaryngologie, // Oto-Rhino-Laryngologie
|
||||||
|
#[deku(id = 12)]
|
||||||
|
Pediatrie, // Pédiatrie
|
||||||
|
#[deku(id = 13)]
|
||||||
|
Pneumologie, // Pneumologie
|
||||||
|
#[deku(id = 14)]
|
||||||
|
Rhumatologie, // Rhumatologie
|
||||||
|
#[deku(id = 15)]
|
||||||
|
Ophtalmologie, // Ophtalmologie
|
||||||
|
#[deku(id = 16)]
|
||||||
|
ChirurgieUrologique, // Chirurgie urologique
|
||||||
|
#[deku(id = 17)]
|
||||||
|
NeuroPsychiatrie, // Neuro-Psychiatrie
|
||||||
|
#[deku(id = 18)]
|
||||||
|
Stomatologie, // Stomatologie
|
||||||
|
#[deku(id = 19)]
|
||||||
|
ChirurgienDentiste, // Chirurgien dentiste
|
||||||
|
#[deku(id = 20)]
|
||||||
|
ReanimationMedicale, // Réanimation médicale
|
||||||
|
#[deku(id = 21)]
|
||||||
|
SageFemme, // Sage-femme
|
||||||
|
#[deku(id = 22)]
|
||||||
|
SpécialisteEnMGDiplome, // Spécialiste en médecine générale avec diplôme
|
||||||
|
#[deku(id = 23)]
|
||||||
|
SpécialisteEnMGReconnu, // Spécialiste en médecine générale reconnu par l’Ordre
|
||||||
|
#[deku(id = 24)]
|
||||||
|
Infirmier, // Infirmier
|
||||||
|
#[deku(id = 25)]
|
||||||
|
Psychologue, // Psychologue
|
||||||
|
#[deku(id = 26)]
|
||||||
|
MasseurKinesitherapeute, // Masseur Kinésithérapeute
|
||||||
|
#[deku(id = 27)]
|
||||||
|
PedicurePodologue, // Pédicure Podologue
|
||||||
|
#[deku(id = 28)]
|
||||||
|
Orthophoniste, // Orthophoniste
|
||||||
|
#[deku(id = 29)]
|
||||||
|
Orthoptiste, // Orthoptiste
|
||||||
|
#[deku(id = 30)]
|
||||||
|
LaboAnalysesMedicales, // Laboratoire d'analyses médicales
|
||||||
|
#[deku(id = 31)]
|
||||||
|
ReeducationReadaptationFonctionnelle, // Rééducation Réadaptation fonctionnelle
|
||||||
|
#[deku(id = 32)]
|
||||||
|
Neurologie, // Neurologie
|
||||||
|
#[deku(id = 33)]
|
||||||
|
Psychiatrie, // Psychiatrie
|
||||||
|
#[deku(id = 34)]
|
||||||
|
Geriatrie, // Gériatrie
|
||||||
|
#[deku(id = 35)]
|
||||||
|
Nephrologie, // Néphrologie
|
||||||
|
#[deku(id = 36)]
|
||||||
|
ChirurgieDentaireSpecialiteODF, // Chirurgie Dentaire spécialité O.D.F
|
||||||
|
#[deku(id = 37)]
|
||||||
|
AnatomoCytoPathologie, // Anatomo-Cyto-Pathologie
|
||||||
|
#[deku(id = 38)]
|
||||||
|
MedecinBiologiste, // Médecin biologiste
|
||||||
|
#[deku(id = 39)]
|
||||||
|
LaboPolyvalent, // Laboratoire polyvalent
|
||||||
|
#[deku(id = 40)]
|
||||||
|
LaboAnatomoCytoPathologique, // Laboratoire d’anatomo-cyto-pathologique
|
||||||
|
#[deku(id = 41)]
|
||||||
|
ChirurgieOrthopediqueTraumatologie, // Chirurgie Orthopédique et Traumatologie
|
||||||
|
#[deku(id = 42)]
|
||||||
|
EndocrinologieMetabolisme, // Endocrinologie et Métabolisme
|
||||||
|
#[deku(id = 43)]
|
||||||
|
ChirurgieInfantile, // Chirurgie infantile
|
||||||
|
#[deku(id = 44)]
|
||||||
|
ChirurgieMaxilloFaciale, // Chirurgie maxillo-faciale
|
||||||
|
#[deku(id = 45)]
|
||||||
|
ChirurgieMaxilloFacialeStomatologie, // Chirurgie maxillo-faciale et stomatologie
|
||||||
|
#[deku(id = 46)]
|
||||||
|
ChirurgiePlastiqueReconstructriceEsthetique, // Chirurgie plastique reconstructrice et esthétique
|
||||||
|
#[deku(id = 47)]
|
||||||
|
ChirurgieThoraciqueCardioVasculaire, // Chirurgie thoracique et cardio-vasculaire
|
||||||
|
#[deku(id = 48)]
|
||||||
|
ChirurgieVasculaire, // Chirurgie vasculaire
|
||||||
|
#[deku(id = 49)]
|
||||||
|
ChirurgieVisceraleDigestive, // Chirurgie viscérale et digestive
|
||||||
|
#[deku(id = 50)]
|
||||||
|
PharmacieDOfficine, // Pharmacie d’officine
|
||||||
|
#[deku(id = 51)]
|
||||||
|
PharmacieMutualiste, // Pharmacie Mutualiste
|
||||||
|
#[deku(id = 53)]
|
||||||
|
ChirurgienDentisteSpecialiteCO, // Chirurgien dentiste spécialité C.O.
|
||||||
|
#[deku(id = 54)]
|
||||||
|
ChirurgienDentisteSpecialiteMBD, // Chirurgien dentiste spécialité M.B.D.
|
||||||
|
#[deku(id = 60)]
|
||||||
|
PrestataireDeTypeSociete, // Prestataire de type société
|
||||||
|
#[deku(id = 61)]
|
||||||
|
PrestataireArtisan, // Prestataire artisan
|
||||||
|
#[deku(id = 62)]
|
||||||
|
PrestataireDeTypeAssociation, // Prestataire de type association
|
||||||
|
#[deku(id = 63)]
|
||||||
|
Orthesiste, // Orthésiste
|
||||||
|
#[deku(id = 64)]
|
||||||
|
Opticien, // Opticien
|
||||||
|
#[deku(id = 65)]
|
||||||
|
Audioprothesiste, // Audioprothésiste
|
||||||
|
#[deku(id = 66)]
|
||||||
|
EpithesisteOculariste, // Épithésiste Oculariste
|
||||||
|
#[deku(id = 67)]
|
||||||
|
PodoOrthesiste, // Podo-orthésiste
|
||||||
|
#[deku(id = 68)]
|
||||||
|
Orthoprothesiste, // Orthoprothésiste
|
||||||
|
#[deku(id = 69)]
|
||||||
|
ChirurgieOrale, // Chirurgie orale
|
||||||
|
#[deku(id = 70)]
|
||||||
|
GynecologieMedicale, // Gynécologie médicale
|
||||||
|
#[deku(id = 71)]
|
||||||
|
Hematologie, // Hématologie
|
||||||
|
#[deku(id = 72)]
|
||||||
|
MedecineNucleaire, // Médecine nucléaire
|
||||||
|
#[deku(id = 73)]
|
||||||
|
OncologieMedicale, // Oncologie médicale
|
||||||
|
#[deku(id = 74)]
|
||||||
|
OncologieRadiotherapique, // Oncologie radiothérapique
|
||||||
|
#[deku(id = 75)]
|
||||||
|
PsychiatrieEnfantAdolescent, // Psychiatrie de l’enfant et de l’adolescent
|
||||||
|
#[deku(id = 76)]
|
||||||
|
Radiotherapie, // Radiothérapie
|
||||||
|
#[deku(id = 77)]
|
||||||
|
Obstetrique, // Obstétrique
|
||||||
|
#[deku(id = 78)]
|
||||||
|
GenetiqueMedicale, // Génétique médicale
|
||||||
|
#[deku(id = 79)]
|
||||||
|
ObstetriqueGynecologieMedicale, // Obstétrique et Gynécologie médicale
|
||||||
|
#[deku(id = 80)]
|
||||||
|
SantePubliqueMedecineSociale, // Santé publique et médecine sociale
|
||||||
|
#[deku(id = 81)]
|
||||||
|
MaladiesInfectieusesTropicales, // Médecine des Maladies infectieuses et tropicales
|
||||||
|
#[deku(id = 82)]
|
||||||
|
MedecineLegaleExpertisesMedicales, // Médecine légale et expertises médicales
|
||||||
|
#[deku(id = 83)]
|
||||||
|
MedecineDurgence, // Médecine d’urgence
|
||||||
|
#[deku(id = 84)]
|
||||||
|
MedecineVasculaire, // Médecine vasculaire
|
||||||
|
#[deku(id = 85)]
|
||||||
|
Allergologie, // Allergologie
|
||||||
|
#[deku(id = 86)]
|
||||||
|
IPA, // Infirmier exerçant en Pratiques Avancées (IPA)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
#[deku(ctx = "id: u8", id = "id")]
|
||||||
|
/// Code zone IK - Indemnité kilométrique
|
||||||
|
/// Dictionnaire des données FSV, p44
|
||||||
|
pub enum IkZoneCode {
|
||||||
|
#[deku(id = 0)]
|
||||||
|
PasDIndemniteKilometrique, // Pas d'indemnité kilométrique
|
||||||
|
#[deku(id = 1)]
|
||||||
|
IndemniteKilometriquePlaine, // Indemnité kilométrique plaine
|
||||||
|
#[deku(id = 2)]
|
||||||
|
IndemniteKilometriqueMontagne, // Indemnité kilométrique montagne
|
||||||
|
}
|
||||||
|
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
#[deku(ctx = "id: u8", id = "id")]
|
||||||
|
/// Code agrément
|
||||||
|
/// Dictionnaire des données FSV, p44
|
||||||
|
pub enum ApprovalCode {
|
||||||
|
#[deku(id = 0)]
|
||||||
|
PasAgrementRadio, // Pas d'agrément radio
|
||||||
|
#[deku(id = 1)]
|
||||||
|
AgrementDOuDDASS, // Agrément D ou DDASS
|
||||||
|
#[deku(id = 2)]
|
||||||
|
AgrementABCEF, // Agrément A, B, C, E, F
|
||||||
|
#[deku(id = 3)]
|
||||||
|
AgrementGHJ, // Agrément G, H, J
|
||||||
|
#[deku(id = 4)]
|
||||||
|
AgrementK, // Agrément K
|
||||||
|
#[deku(id = 5)]
|
||||||
|
AgrementL, // Agrément L
|
||||||
|
#[deku(id = 6)]
|
||||||
|
AgrementM, // Agrément M
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use deku::DekuContainerRead as _;
|
||||||
|
use group_1_holder::{CardPSType, CategoryCard, CivilityCode, NationalIDType};
|
||||||
|
use group_2_situation::{ActivitySector, ApprovalCode, ConventionCode, IkZoneCode, PracticeMode, SpecialtyCode, StructureIDType};
|
||||||
|
|
||||||
|
use crate::fsv_parsing::blocks::BlockHeader;
|
||||||
|
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
mod data {
|
||||||
|
pub const BUFFER: &[u8] = &[
|
||||||
|
0, 1, // Block ID
|
||||||
|
53, // Block size
|
||||||
|
1, // Type de carte PS, 2 CN
|
||||||
|
48, // 0
|
||||||
|
1, // Type d'identification nationale, 1 CN
|
||||||
|
56, // 8
|
||||||
|
11, // N° d'identification nationale, 8-30 CE
|
||||||
|
57, 57, 55, 48, 48, 53, 57, 51, 54, 56, 54,
|
||||||
|
1, // Clé du N° d'identification nationale, 1 CN
|
||||||
|
54, // 6
|
||||||
|
2, // Code civilité, 2 CN
|
||||||
|
51, 49, // 31
|
||||||
|
23, // Nom du PS, 27 CE
|
||||||
|
80, 72, 65, 82, 77, 79, 70, 70, 73, 67,
|
||||||
|
69, 32, 82, 80, 80, 83, 48, 48, 53, 57,
|
||||||
|
51, 54, 56,
|
||||||
|
7, // Prénom du PS, 27 CE
|
||||||
|
71, 73, 76, 66, 69, 82, 84,
|
||||||
|
// ??? Missing ??? Catégorie Carte, 1 CA
|
||||||
|
0, 2, // Block ID
|
||||||
|
93, // Block size
|
||||||
|
1, // N° logique de la situation de facturation du PS, 1 CB
|
||||||
|
1,
|
||||||
|
1, // Mode d'exercice, 2 CN
|
||||||
|
48,
|
||||||
|
1, // Statut d'exercice, 3 CN
|
||||||
|
49,
|
||||||
|
2, // Secteur d'activité, 3 CN
|
||||||
|
56, 54,
|
||||||
|
1, // Type d'identification structure, 1 CN
|
||||||
|
49,
|
||||||
|
9, // N° d'identification structure, 14 CA
|
||||||
|
48, 66, 48, 50, 52, 54, 50, 56, 54, // 0B0246286
|
||||||
|
1, // Clé du N° d'identification structure, 1 CN
|
||||||
|
54,
|
||||||
|
34, // Raison sociale structure, 40 CE
|
||||||
|
80, 72, 65, 82, 77, 65, 67, 73, 69, 32,
|
||||||
|
68, 69, 32, 76, 65, 32, 71, 65, 82, 69,
|
||||||
|
32, 82, 79, 85, 84, 73, 69, 82, 69, 50,
|
||||||
|
52, 54, 50, 56,
|
||||||
|
8, // N° d'identification de facturation du PS, 8 CN
|
||||||
|
48, 48, 50, 48, 57, 51, 54, 56, // 00209368
|
||||||
|
1, // Clé du N° d'identification de facturation du PS, 1 CN
|
||||||
|
48,
|
||||||
|
0, // N° d'identification du PS remplaçant, 30 CA
|
||||||
|
1, // Clé du N° d'identification du PS remplaçant, 1 CN
|
||||||
|
48,
|
||||||
|
1, // Code conventionnel, 1 CN
|
||||||
|
49,
|
||||||
|
2, // Code spécialité, 2 CN
|
||||||
|
53, 48,
|
||||||
|
2, // Code zone tarifaire, 2 CN
|
||||||
|
49, 48,
|
||||||
|
2, // Code zone IK
|
||||||
|
48, 48,
|
||||||
|
1, // Code agrément 1, 1 CN
|
||||||
|
48,
|
||||||
|
1, // Code agrément 2, 1 CN
|
||||||
|
48,
|
||||||
|
1, // Code agrément 3, 1 CN
|
||||||
|
48,
|
||||||
|
1, // Habilitation à signer une Facture // 1 CN
|
||||||
|
49,
|
||||||
|
1, // Habilitation à signer un lot // 1 CN
|
||||||
|
49,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_lire_carte_ps_first_header() {
|
||||||
|
// env_logger::init(); // Uncomment and run with RUST_LOG=trace for deku debugging
|
||||||
|
let ((_rest, _offset), block_header) = BlockHeader::from_bytes((data::BUFFER, 0)).unwrap();
|
||||||
|
assert_eq!(block_header.group_id.0, 1, "Header ID");
|
||||||
|
assert_eq!(block_header.data_size, 53, "Header Size");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_group_1_holder() {
|
||||||
|
// env_logger::init(); // Uncomment and run with RUST_LOG=trace for deku debugging
|
||||||
|
let offset = 3*8;
|
||||||
|
let (_rest, holder) = group_1_holder::Holder::from_bytes((data::BUFFER, offset)).unwrap();
|
||||||
|
assert_eq!(holder.card_type, CardPSType::CPS, "Card type");
|
||||||
|
assert_eq!(holder.national_id_type, NationalIDType::RPPS, "National ID type");
|
||||||
|
assert_eq!(holder.national_id.0, "99700593686", "National Id");
|
||||||
|
assert_eq!(holder.national_id_key.0, "6", "National ID Key");
|
||||||
|
assert_eq!(holder.civility_code, CivilityCode::Monsieur, "Civility Code");
|
||||||
|
assert_eq!(holder.holder_lastname.0, "PHARMOFFICE RPPS0059368", "Holder Lastname");
|
||||||
|
assert_eq!(holder.holder_firstname.0, "GILBERT", "Holder Firstname");
|
||||||
|
assert_eq!(holder.category_card, CategoryCard::Unknown, "Category card");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_group_2_situation() {
|
||||||
|
// env_logger::init(); // Uncomment and run with RUST_LOG=trace for deku debugging
|
||||||
|
let offset = 3*8 + 53*8 + 3*8;
|
||||||
|
let (_rest, situation) = group_2_situation::Situation::from_bytes((data::BUFFER, offset)).unwrap();
|
||||||
|
assert_eq!(situation.id.0, 1, "ID");
|
||||||
|
assert_eq!(situation.practice_mode, PracticeMode::Liberal, "Practice mode");
|
||||||
|
assert_eq!(situation.practice_status_raw.0, "1", "Practice status raw");
|
||||||
|
assert_eq!(situation.activity_sector, ActivitySector::PharmacieDOfficine, "Activity sector");
|
||||||
|
assert_eq!(situation.structure_id_type, StructureIDType::FINESS, "Structure ID type");
|
||||||
|
assert_eq!(situation.structure_id.0, "0B0246286", "Structure ID");
|
||||||
|
assert_eq!(situation.structure_id_key.0, "6", "Structure ID key");
|
||||||
|
assert_eq!(situation.structure_name.0, "PHARMACIE DE LA GARE ROUTIERE24628", "Structure name");
|
||||||
|
assert_eq!(situation.ps_billing_number.0, "00209368", "PS billing number");
|
||||||
|
assert_eq!(situation.ps_billing_number_key.0, "0", "PS billing number key");
|
||||||
|
assert_eq!(situation.ps_replacement_number.0, "", "PS replacement number");
|
||||||
|
assert_eq!(situation.ps_replacement_number_key.0, "0", "PS replacement number key");
|
||||||
|
assert_eq!(situation.convention_code, ConventionCode::Conventionne, "Convention code");
|
||||||
|
assert_eq!(situation.specialty_code, SpecialtyCode::PharmacieDOfficine, "Specialty code");
|
||||||
|
assert_eq!(situation.rate_zone_code_raw.0, "10", "Rate zone code raw");
|
||||||
|
assert_eq!(situation.ik_zone_code, IkZoneCode::PasDIndemniteKilometrique, "IK zone code");
|
||||||
|
assert_eq!(situation.approval_code_1, ApprovalCode::PasAgrementRadio, "Approval code 1");
|
||||||
|
assert_eq!(situation.approval_code_2_raw.0, "0", "Approval code 2 raw");
|
||||||
|
assert_eq!(situation.approval_code_3_raw.0, "0", "Approval code 3 raw");
|
||||||
|
assert_eq!(situation.invoice_signature_permission.0, "1", "Invoice signature permission");
|
||||||
|
assert_eq!(situation.lot_signature_permission.0, "1", "Lot signature permission");
|
||||||
|
}
|
||||||
|
}
|
296
crates/fsv/src/fsv_parsing/groups/ssv_lire_config.rs
Normal file
296
crates/fsv/src/fsv_parsing/groups/ssv_lire_config.rs
Normal file
@ -0,0 +1,296 @@
|
|||||||
|
//! # Structures de parsing des données de la fonction SSV_LireConfig
|
||||||
|
|
||||||
|
//! Le groupe `ReaderConfig61` décrit ci-dessous est renseigné en cas d’utilisation d’un
|
||||||
|
//! lecteur homologué sesam-vitale uniquement et non en cas
|
||||||
|
//! d’utilisation de lecteur(s) PC/SC. dans le cas d’un TL ou TLA
|
||||||
|
//! configuré en mode PC/SC, un groupe `ReaderConfig61` est restitué pour chaque
|
||||||
|
//! lecteur exposé par le gestionnaire de ressources PC/SC. les
|
||||||
|
//! informations sont alors dupliquées dans chacun des groupes `ReaderConfig61`.
|
||||||
|
//! les informations sur les lecteurs PC/SC sont disponibles
|
||||||
|
//! dans les groupes `PCSCReaderConfig67`.
|
||||||
|
|
||||||
|
use deku::deku_derive;
|
||||||
|
|
||||||
|
use super::{AlphaNumericString, NumericString, SoftwareVersion};
|
||||||
|
|
||||||
|
/// # En-tête de configuration
|
||||||
|
/// 1 occurence
|
||||||
|
pub mod group_60_header_config {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
/// Groupe 60 - En-tête de configuration
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
pub struct ConfigHeader {
|
||||||
|
pub ssv_version: SSVVersionNumber,
|
||||||
|
pub galss_version: GALSSVersionNumber,
|
||||||
|
pub pss_version: PSSVersionNumber,
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fields
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
pub struct SSVVersionNumber(pub SoftwareVersion);
|
||||||
|
|
||||||
|
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
pub struct GALSSVersionNumber(pub SoftwareVersion);
|
||||||
|
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
pub struct PSSVersionNumber(pub SoftwareVersion);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// # Configuration du lecteur
|
||||||
|
/// 0 à 15 occurences
|
||||||
|
pub mod group_61_reader_config {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
/// Groupe 61 - Configuration du lecteur
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
pub struct ReaderConfig {
|
||||||
|
pub manufacturer_name: AlphaNumericString, // 15 CA
|
||||||
|
pub reader_type: AlphaNumericString, // 30 CA
|
||||||
|
pub serial_number: AlphaNumericString, // 20 CA
|
||||||
|
pub os: NumericString, // 2 CN
|
||||||
|
pub software_count: NumericString, // 2 CN
|
||||||
|
pub software_name: AlphaNumericString, // 30 CA
|
||||||
|
pub software_version: ReaderSoftwareVersion, // 4 CA
|
||||||
|
pub reader_datetime: ReaderSoftwareDate, // 12 CN
|
||||||
|
pub software_checksum: AlphaNumericString, // 4 CA
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fields
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
pub struct ReaderSoftwareVersion(pub SoftwareVersion);
|
||||||
|
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
/// Format « AAAAMMJJhhmm »
|
||||||
|
/// TODO: Build a generic date-time structure
|
||||||
|
/// TODO: Implement a date parsing, like chrono crate
|
||||||
|
pub struct ReaderSoftwareDate(pub AlphaNumericString);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// # Configuration SESAM-Vitale
|
||||||
|
/// N occurences
|
||||||
|
pub mod group_64_sv_config {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
/// Groupe 64 - Configuration SESAM-Vitale
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
pub struct SVComponentsConfig {
|
||||||
|
pub id: ComponentID,
|
||||||
|
pub description: ComponentDescription,
|
||||||
|
pub version: ComponentVersion,
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fields
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
pub struct ComponentID(pub NumericString);
|
||||||
|
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
pub struct ComponentDescription(pub AlphaNumericString);
|
||||||
|
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
pub struct ComponentVersion(pub AlphaNumericString);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// # Configuration du lecteur PC/SC
|
||||||
|
/// N occurences
|
||||||
|
pub mod group_67_pcsc_config {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
/// Groupe 67 - Configuration du lecteur PC/SC
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
pub struct PCSCReaderConfig {
|
||||||
|
pub name: ReaderName,
|
||||||
|
pub card_type: CardType,
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fields
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
pub struct ReaderName(pub AlphaNumericString);
|
||||||
|
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
pub struct CardType(pub NumericString);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use deku::DekuContainerRead as _;
|
||||||
|
|
||||||
|
use crate::fsv_parsing::blocks::{BlockHeader, Data, DataBlock, DataGroup};
|
||||||
|
|
||||||
|
mod data {
|
||||||
|
pub const BUFFER: &[u8] = &[
|
||||||
|
0, 60, // Block ID
|
||||||
|
15, // Block Size
|
||||||
|
4, // SSV Version
|
||||||
|
48, 55, 50, 48, // 0720
|
||||||
|
4, // GALSS Version
|
||||||
|
48, 48, 48, 48, // 0000
|
||||||
|
4, // PSS Version
|
||||||
|
48, 48, 48, 48, // 0000
|
||||||
|
0, 67, // Block ID
|
||||||
|
42, // Block Size
|
||||||
|
39, // PCSC Reader Name
|
||||||
|
71, 101, 109, 97, 108, 116, 111, 32, 80, 67,
|
||||||
|
32, 84, 119, 105, 110, 32, 82, 101, 97, 100,
|
||||||
|
101, 114, 32, 40, 54, 52, 53, 68, 57, 52,
|
||||||
|
67, 51, 41, 32, 48, 48, 32, 48, 48,
|
||||||
|
1, // Card type
|
||||||
|
50,
|
||||||
|
0, 64, // Block ID
|
||||||
|
44, // Block Size
|
||||||
|
2, // Component ID
|
||||||
|
49, 49,
|
||||||
|
35, // Component label
|
||||||
|
86, 69, 82, 83, 73, 79, 78, 32, 68, 69,
|
||||||
|
32, 76, 65, 32, 66, 73, 66, 76, 73, 79,
|
||||||
|
84, 72, 69, 81, 85, 69, 32, 68, 85, 32,
|
||||||
|
71, 65, 76, 83, 83,
|
||||||
|
4, // Component version
|
||||||
|
48, 48, 48, 48,
|
||||||
|
0, 64, // Block ID
|
||||||
|
69, // Block Size
|
||||||
|
3, // Component ID
|
||||||
|
49, 53, 49,
|
||||||
|
27, // Component label
|
||||||
|
73, 68, 69, 78, 84, 73, 70, 73, 65, 78,
|
||||||
|
84, 32, 85, 78, 73, 81, 85, 69, 32, 68,
|
||||||
|
85, 32, 80, 79, 83, 84, 69,
|
||||||
|
36, // Component version
|
||||||
|
50, 54, 57, 102, 99, 55, 101, 98, 45, 49,
|
||||||
|
100, 56, 53, 45, 52, 55, 57, 51, 45, 98,
|
||||||
|
55, 48, 101, 45, 51, 55, 49, 99, 51, 56,
|
||||||
|
102, 57, 49, 54, 51, 52,
|
||||||
|
0, 61, // Block ID
|
||||||
|
62, // Block Size
|
||||||
|
17, // Manufacturer Name
|
||||||
|
84, 69, 83, 84, 32, 77, 65, 78, 85, 70,
|
||||||
|
65, 67, 84, 85, 82, 69, 82,
|
||||||
|
4, // Reader Type
|
||||||
|
84, 69, 83, 84,
|
||||||
|
4, // Serial Number
|
||||||
|
84, 69, 83, 84,
|
||||||
|
2, // OS
|
||||||
|
79, 83,
|
||||||
|
2, // Software Count
|
||||||
|
48, 49,
|
||||||
|
4, // Software Name
|
||||||
|
84, 69, 83, 84,
|
||||||
|
4, // Software Version
|
||||||
|
48, 49, 53, 53,
|
||||||
|
12, // Reader Datetime
|
||||||
|
50, 48, 50, 52, // 2024
|
||||||
|
48, 54, 50, 53, // 06-25
|
||||||
|
49, 50, 52, 53, // 12:45
|
||||||
|
4, // Software Checksum
|
||||||
|
49, 50, 51, 52,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_lire_config_first_header() {
|
||||||
|
// env_logger::init(); // Uncomment and run with RUST_LOG=trace for deku debugging
|
||||||
|
let buffer = data::BUFFER;
|
||||||
|
let offset: usize = 0;
|
||||||
|
|
||||||
|
let ((_rest, _offset), block_header) = BlockHeader::from_bytes((buffer, offset)).unwrap();
|
||||||
|
assert_eq!(block_header.group_id.0, 60, "Header ID");
|
||||||
|
assert_eq!(block_header.data_size, 15, "Header Size");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_lire_config_first_block() {
|
||||||
|
// env_logger::init(); // Uncomment and run with RUST_LOG=trace for deku debugging
|
||||||
|
let buffer = data::BUFFER;
|
||||||
|
let offset: usize = 0;
|
||||||
|
|
||||||
|
let ((_rest, _offset), block) = DataBlock::from_bytes((buffer, offset)).unwrap();
|
||||||
|
let header = block.header;
|
||||||
|
let content = match block.content {
|
||||||
|
DataGroup::LireConfig_Group60_ConfigHeader(content) => content,
|
||||||
|
_ => panic!("Unexpected data block type"),
|
||||||
|
};
|
||||||
|
assert_eq!(header.group_id.0, 60, "Header ID");
|
||||||
|
assert_eq!(header.data_size, 15, "Header Size");
|
||||||
|
assert_eq!(content.ssv_version.0.version, "07", "SSV Version");
|
||||||
|
assert_eq!(content.ssv_version.0.revision, "20", "SSV Revision");
|
||||||
|
assert_eq!(content.galss_version.0.to_string(), "00.00", "GALSS Version");
|
||||||
|
assert_eq!(content.pss_version.0.to_string(), "00.00", "PSS Version");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_lire_config_all() {
|
||||||
|
// env_logger::init(); // Uncomment and run with RUST_LOG=trace for deku debugging
|
||||||
|
let buffer = data::BUFFER;
|
||||||
|
let offset: usize = 0;
|
||||||
|
|
||||||
|
let ((_rest, _offset), data) = Data::from_bytes((buffer, offset)).unwrap();
|
||||||
|
let blocks = data.blocks;
|
||||||
|
assert_eq!(blocks.len(), 5, "Number of blocks");
|
||||||
|
for block in blocks {
|
||||||
|
match block.content {
|
||||||
|
DataGroup::LireConfig_Group60_ConfigHeader(content) => {
|
||||||
|
assert_eq!(block.header.group_id.0, 60, "Header ID");
|
||||||
|
assert_eq!(block.header.data_size, 15, "Header Size");
|
||||||
|
assert_eq!(content.ssv_version.0.version, "07", "SSV Version");
|
||||||
|
assert_eq!(content.ssv_version.0.revision, "20", "SSV Revision");
|
||||||
|
assert_eq!(content.galss_version.0.to_string(), "00.00", "GALSS Version");
|
||||||
|
assert_eq!(content.pss_version.0.to_string(), "00.00", "PSS Version");
|
||||||
|
},
|
||||||
|
DataGroup::LireConfig_Group61_ReaderConfig(content) => {
|
||||||
|
assert_eq!(block.header.group_id.0, 61, "Header ID");
|
||||||
|
assert_eq!(block.header.data_size, 62, "Header Size");
|
||||||
|
assert_eq!(content.manufacturer_name.0, "TEST MANUFACTURER", "Manufacturer Name");
|
||||||
|
assert_eq!(content.reader_type.0, "TEST", "Reader Type");
|
||||||
|
assert_eq!(content.serial_number.0, "TEST", "Serial Number");
|
||||||
|
assert_eq!(content.os.0, "OS", "OS");
|
||||||
|
assert_eq!(content.software_count.0, "01", "Software Count");
|
||||||
|
assert_eq!(content.software_name.0, "TEST", "Software Name");
|
||||||
|
assert_eq!(content.software_version.0.version, "01", "Software Version");
|
||||||
|
assert_eq!(content.software_version.0.revision, "55", "Software Revision");
|
||||||
|
assert_eq!(content.reader_datetime.0.0, "202406251245", "Reader Datetime");
|
||||||
|
assert_eq!(content.software_checksum.0, "1234", "Software Checksum");
|
||||||
|
},
|
||||||
|
DataGroup::LireConfig_Group64_SVComponentsConfig(content) => {
|
||||||
|
assert_eq!(block.header.group_id.0, 64, "Header ID");
|
||||||
|
match content.id.0.0.as_str() {
|
||||||
|
"11" => {
|
||||||
|
assert_eq!(block.header.data_size, 44, "Header Size");
|
||||||
|
assert_eq!(content.id.0.0, "11", "G64 - 11 : Component ID");
|
||||||
|
assert_eq!(content.description.0.0, "VERSION DE LA BIBLIOTHEQUE DU GALSS", "G64 - 11 : Component Description");
|
||||||
|
assert_eq!(content.version.0.0, "0000", "G64 - 11 : Component Version");
|
||||||
|
},
|
||||||
|
"151" => {
|
||||||
|
assert_eq!(block.header.data_size, 69, "Header Size");
|
||||||
|
assert_eq!(content.id.0.0, "151", "G64 - 151 : Component ID");
|
||||||
|
assert_eq!(content.description.0.0, "IDENTIFIANT UNIQUE DU POSTE", "G64 - 151 : Component Description");
|
||||||
|
assert_eq!(content.version.0.0, "269fc7eb-1d85-4793-b70e-371c38f91634", "G64 - 151 : Component Version");
|
||||||
|
},
|
||||||
|
_ => panic!("Unexpected Component ID"),
|
||||||
|
}
|
||||||
|
},
|
||||||
|
DataGroup::LireConfig_Group67_PCSCReaderConfig(content) => {
|
||||||
|
assert_eq!(block.header.group_id.0, 67, "Header ID");
|
||||||
|
assert_eq!(block.header.data_size, 42, "Header Size");
|
||||||
|
assert_eq!(content.name.0.0, "Gemalto PC Twin Reader (645D94C3) 00 00", "Reader Name");
|
||||||
|
assert_eq!(content.card_type.0.0, "2", "Card Type");
|
||||||
|
},
|
||||||
|
_ => panic!("Unexpected data block type"),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
132
crates/fsv/src/fsv_parsing/mod.rs
Normal file
132
crates/fsv/src/fsv_parsing/mod.rs
Normal file
@ -0,0 +1,132 @@
|
|||||||
|
use deku::ctx::BitSize;
|
||||||
|
use deku::prelude::*;
|
||||||
|
use deku::reader::ReaderRet;
|
||||||
|
use deku::{reader::Reader, DekuError};
|
||||||
|
|
||||||
|
pub mod blocks;
|
||||||
|
pub mod groups;
|
||||||
|
pub mod prelude;
|
||||||
|
|
||||||
|
pub use blocks::Data;
|
||||||
|
|
||||||
|
/// # Read the size of a FSV block / field
|
||||||
|
/// Documentation: SSV Documentation, page 29
|
||||||
|
fn size_read<R: std::io::Read + std::io::Seek>(reader: &mut Reader<R>) -> Result<u64, DekuError> {
|
||||||
|
let size_bytes = u8::from_reader_with_ctx(reader, BitSize(8))?;
|
||||||
|
let size: u64 = if size_bytes & 0b1000_0000 == 0 {
|
||||||
|
// If the Most Significant Bit is 0, the size is encoded on 7 bits
|
||||||
|
size_bytes.into()
|
||||||
|
} else {
|
||||||
|
// Else, the 7 following bits indicate the number of bytes of the block containing the size
|
||||||
|
let size_block_len: usize = (size_bytes & 0b0111_1111).into();
|
||||||
|
if size_block_len > 4 {
|
||||||
|
return Err(DekuError::Parse(format!("Unexpected size block length: {}", size_block_len).into()));
|
||||||
|
};
|
||||||
|
// The block containing the size is encoded on 1 to 4 bytes
|
||||||
|
let buffer: &mut [u8; 4] = &mut [0; 4];
|
||||||
|
let write_offset = 4 - size_block_len;
|
||||||
|
match reader.read_bytes(size_block_len, &mut buffer[write_offset..])? {
|
||||||
|
ReaderRet::Bits(_bit_vec) => return Err(DekuError::Parse("Unexpected result reading size bytes: got bits".into())),
|
||||||
|
ReaderRet::Bytes => u32::from_be_bytes(*buffer).into(),
|
||||||
|
}
|
||||||
|
};
|
||||||
|
Ok(size)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Deku Reader taking an expected size into account
|
||||||
|
/// This function limit the reading to the size given in input
|
||||||
|
fn read_with_size<T, R: std::io::Read + std::io::Seek>(
|
||||||
|
reader: &mut Reader<R>,
|
||||||
|
size: usize
|
||||||
|
) -> Result<T, DekuError>
|
||||||
|
where T: for<'a> DekuContainerRead<'a>
|
||||||
|
{
|
||||||
|
let max_size = core::mem::size_of::<T>();
|
||||||
|
let mut buf = vec![0; max_size];
|
||||||
|
let buf: &mut [u8] = &mut buf;
|
||||||
|
let ret = reader.read_bytes(size, buf)?;
|
||||||
|
let (_rest, block) = match ret {
|
||||||
|
ReaderRet::Bytes => {
|
||||||
|
T::from_bytes((buf, 0))?
|
||||||
|
},
|
||||||
|
_ => return Err(DekuError::Parse("Unexpected result reading size bytes: got bits".into())),
|
||||||
|
};
|
||||||
|
Ok(block)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// # Map bytes to a lossy string
|
||||||
|
/// This function is used to map bytes to a string, ignoring invalid UTF-8 characters
|
||||||
|
/// Example: [0x41, 0x42] -> "AB"
|
||||||
|
/// Example: [48, 49, 50, 51] -> "0123"
|
||||||
|
fn map_bytes_to_lossy_string(data: &[u8]) -> Result<String, DekuError> {
|
||||||
|
// let data = data.to_vec();
|
||||||
|
let version: String = String::from_utf8_lossy(data).to_string();
|
||||||
|
Ok(version)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_read_with_size_reader() {
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
struct Data {
|
||||||
|
#[deku(read_all)]
|
||||||
|
pub blocks: Vec<Block>,
|
||||||
|
}
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
struct Block {
|
||||||
|
pub size: u8,
|
||||||
|
pub id: u8,
|
||||||
|
#[deku(ctx = "*id,*size-1")] // size-1 to remove the ID size
|
||||||
|
pub data: BlockType,
|
||||||
|
}
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
#[deku(ctx = "id: u8, size: u8", id = "id")]
|
||||||
|
enum BlockType {
|
||||||
|
#[deku(id = 1)]
|
||||||
|
Block1(
|
||||||
|
#[deku(reader = "read_with_size(deku::reader, size as usize)")]
|
||||||
|
Block1
|
||||||
|
),
|
||||||
|
#[deku(id = 2)]
|
||||||
|
Block2(
|
||||||
|
#[deku(reader = "read_with_size(deku::reader, size as usize)")]
|
||||||
|
Block2
|
||||||
|
),
|
||||||
|
}
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
struct Block1 {
|
||||||
|
pub field1_size: u8,
|
||||||
|
pub field1: u16,
|
||||||
|
pub field2_size: u8,
|
||||||
|
pub field2: u64,
|
||||||
|
}
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
struct Block2;
|
||||||
|
|
||||||
|
let buffer = &[
|
||||||
|
// 1st Block, type 1
|
||||||
|
4, // Size: 4
|
||||||
|
1, // ID: 1
|
||||||
|
2, 0x12, 0x34, // Field 1, size 2
|
||||||
|
// No Field 2
|
||||||
|
// 2nd Block, type 1
|
||||||
|
6, // Size: Y
|
||||||
|
1, // ID: 2
|
||||||
|
1, 0x56, // Field 1, size 1 (casted into u16)
|
||||||
|
2, 0x78, 0x9A // Field 2, size 2
|
||||||
|
];
|
||||||
|
|
||||||
|
let (_rest, val) = Data::from_bytes((buffer, 0)).unwrap();
|
||||||
|
assert_eq!(val.blocks.len(), 2);
|
||||||
|
assert_eq!(val.blocks[0].size, 4);
|
||||||
|
assert_eq!(val.blocks[1].size, 6);
|
||||||
|
}
|
||||||
|
}
|
6
crates/fsv/src/fsv_parsing/prelude.rs
Normal file
6
crates/fsv/src/fsv_parsing/prelude.rs
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
/*! Crate prelude
|
||||||
|
|
||||||
|
[What is a prelude?](std::prelude)
|
||||||
|
*/
|
||||||
|
pub use deku::DekuContainerRead as _;
|
||||||
|
pub use super::Data;
|
2
crates/fsv/src/lib.rs
Normal file
2
crates/fsv/src/lib.rs
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
pub mod fsv_parsing;
|
||||||
|
pub mod ssv;
|
183
crates/fsv/src/ssv/errors_ssv.rs
Normal file
183
crates/fsv/src/ssv/errors_ssv.rs
Normal file
@ -0,0 +1,183 @@
|
|||||||
|
use num_enum::FromPrimitive;
|
||||||
|
use thiserror::Error;
|
||||||
|
|
||||||
|
#[derive(Error, Debug, Eq, PartialEq, FromPrimitive)]
|
||||||
|
#[repr(u16)]
|
||||||
|
/// Liste des codes d'erreur retournés par la librairie C SSV
|
||||||
|
/// Documentation: Manuel de programmation SSV - Annexe A (p. 215)
|
||||||
|
pub enum SSVErrorCodes {
|
||||||
|
#[error("La Carte du Professionnel de Santé est absente du lecteur.")]
|
||||||
|
CPSMissing = 0xF001,
|
||||||
|
#[error("La Carte du Professionnel de Santé bloquée après trois codes porteur erronés.")]
|
||||||
|
CPSBlocked = 0xF002,
|
||||||
|
#[error("Le code porteur présenté est erroné.")]
|
||||||
|
CPSPinWrong = 0xF003,
|
||||||
|
#[error("Carte du Professionnel de Santé non valide ou inexploitable par le Logiciel Lecteur. Vérifier la présence d'un Domaine d'Assurance Maladie (DAM).")]
|
||||||
|
CPSInvalid = 0xF004,
|
||||||
|
#[error("La Carte du Professionnel de Santé est retirée du lecteur.")]
|
||||||
|
CPSRemoved = 0xF005,
|
||||||
|
/// - Sécurisation d'une série de lots en cours.
|
||||||
|
/// - Pour les fonctions TLA (sauf Identifier TLA) : Cette erreur survient lorsque le simulateur TLA est en mode 1.50.
|
||||||
|
/// - Lire Date Lecteur, Mettre à jour Date Lecteur, Lire Droits Vitale : Cette erreur peut survenir lorsque le Logiciel Lecteur ne connaît pas la fonction sollicitée, c'est-à-dire si la version du Logiciel Lecteur est antérieure à 2.00.
|
||||||
|
/// - Décharger Données Bénéficiaires : cette erreur peut survenir pour signaler que le format des données issues du lecteur est incompatible avec cette version de SSV.
|
||||||
|
#[error("F022: Erreur commune à plusieurs fonctions.")]
|
||||||
|
F022 = 0xF022,
|
||||||
|
#[error("Message du lecteur incohérent. Débrancher et rebrancher le lecteur.")]
|
||||||
|
PCSCInconsistentMessage = 0xF0FF,
|
||||||
|
#[error("Le nom de lecteur fourni ne correspond à aucun lecteur reconnu.")]
|
||||||
|
PCSCReaderNotFound = 0xF101,
|
||||||
|
#[error("La fonction InitLIB2 n'est pas encore appelée ou la fonction TermLIB a déjà été appelée.")]
|
||||||
|
FunctionInitLib2NotCalled = 0xF600,
|
||||||
|
#[error("La bibliothèque SSV n’est pas chargée en mémoire. Vérifier que la fonction InitLIB2 a bien été appelée.")]
|
||||||
|
LibraryNotLoaded = 0xF690, // Warning
|
||||||
|
#[error("Carte vitale en opposition.")]
|
||||||
|
VitaleOpposition = 0xF6A1,
|
||||||
|
#[error("Zone de mémoire non allouée en sortie.")]
|
||||||
|
MemoryNotAllocated = 0xF800,
|
||||||
|
#[error("Erreur d'allocation de la zone de mémoire en sortie.")]
|
||||||
|
MemoryAllocationError = 0xF801,
|
||||||
|
#[error("Un des paramètres obligatoires d'entrée est non alloué ou invalide.")]
|
||||||
|
InputParameterNotAllocatedOrInvalid = 0xF802,
|
||||||
|
#[error("Zone de mémoire spécifiée en entrée non valide. Vérifier que la zone allouée ne dépasse pas la taille maximale autorisée (MAXBLOC).")]
|
||||||
|
InputMemoryInvalid = 0xF803,
|
||||||
|
#[error("Le format de la zone de mémoire d'entrée ou le nombre de zones mémoire est incorrect.")]
|
||||||
|
InputMemoryFormatIncorrect = 0xF810,
|
||||||
|
#[error("Problème lors de l’initialisation du protocole. Erreur du Ressource Manager PC/SC. Vérifiez le lecteur.")]
|
||||||
|
PCSCProtocolInitError = 0xFF01,
|
||||||
|
#[error("Time-out au niveau protocolaire ou transmission déjà en cours avec le lecteur. Vérifiez le lecteur et l'insertion de la carte.")]
|
||||||
|
PCSCProtocolTimeout = 0xFF02,
|
||||||
|
#[error("Taille insuffisante allouée en entrée d’une fonction du Resource Manager.")]
|
||||||
|
PCSCProtocolInputMemoryTooSmall = 0xFF03,
|
||||||
|
#[error("Erreur de transmission du protocole. Vérifiez le lecteur et l'insertion de la carte.")]
|
||||||
|
PCSCProtocolTransmissionError = 0xFF04,
|
||||||
|
#[error("Lecteur absent ou indisponible.")]
|
||||||
|
PCSCReaderMissingOrUnavailable = 0xFF05,
|
||||||
|
#[error("Le nom du lecteur transmis est inconnu du Resource Manager PC/SC.")]
|
||||||
|
PCSCReaderUnknown = 0xFF06,
|
||||||
|
#[error("Erreur inconnue remontée par le Resource Manager PC/SC.")]
|
||||||
|
PCSCUnknownError = 0xFF07,
|
||||||
|
#[error("Erreur interne Resource Manager PC/SC.")]
|
||||||
|
PCSCInternalError = 0xFF08,
|
||||||
|
#[error("Ressource PC/SC déjà prise en exclusivité. Vérifiez qu'une autre application n'utilise pas le lecteur.")]
|
||||||
|
PCSCResourceAlreadyExclusive = 0xFF09,
|
||||||
|
#[error("Protocole incompatible avec la carte à puce. Vérifiez l'insertion de la carte et son état.")]
|
||||||
|
PCSCProtocolIncompatible = 0xFF0A,
|
||||||
|
#[error("Paramètre incorrect. Erreur interne à la librairie SSV.")]
|
||||||
|
PCSCIncorrectParameter = 0xFF0B,
|
||||||
|
#[error("Carte absente. Insérez une carte dans le lecteur.")]
|
||||||
|
PCSCCardMissing = 0xFF0C,
|
||||||
|
#[error("L'état de la carte a été modifié (RAZ ou mise hors tension). Vérifiez si la carte n'a pas été retirée ou si une autre application n'utilise pas la carte.")]
|
||||||
|
PCSCCardStateChanged = 0xFF0D,
|
||||||
|
#[error("Carte muette ou non supportée. Vérifiez l'insertion de la carte.")]
|
||||||
|
PCSCCardUnsupported = 0xFF0E,
|
||||||
|
#[error("Code porteur CPS non renseigné.")]
|
||||||
|
CPSPinMissing = 0xFF21,
|
||||||
|
#[error("Ressource PC/SC déjà prise en exclusivité. Vérifiez que le processus en cours n'utilise pas déjà le lecteur.")]
|
||||||
|
PCSCReaderAlreadyExclusiveForCurrentProcess = 0xFF24,
|
||||||
|
#[error("Plusieurs lecteurs ou cartes de même type identifiés lors de la détection automatique.")]
|
||||||
|
PCSCDuplicatedReadersOrCardsDetected = 0xFF29,
|
||||||
|
#[error("Problème de chargement de la librairie cryptographique ou erreur retournée par la librairie cryptographique.")]
|
||||||
|
CryptoLibraryError = 0xFF30,
|
||||||
|
#[error("Erreurs internes aux Services SESAM-Vitale. Vérifiez les traces.")]
|
||||||
|
#[num_enum(alternatives = [0xFFF1..=0xFFFF])]
|
||||||
|
SSVInternalError = 0xFFF0,
|
||||||
|
#[error("Le fichier `tablebin.smc` est inaccessible en lecture (inexistant ou pas de droits d'accès).")]
|
||||||
|
FileMissingTablebinMsc = 0xF610, // tablebin.smc
|
||||||
|
#[error("Le fichier `scripts.sms` est inaccessible en lecture (inexistant ou pas de droits d'accès).")]
|
||||||
|
FileMissingScriptsSms = 0xF611, // scripts.sms
|
||||||
|
#[error("Le fichier `tablebin.ssv` est inaccessible en lecture (inexistant ou pas de droits d'accès).")]
|
||||||
|
FileMissingTablebinSsv = 0xF612, // tablebin.ssv
|
||||||
|
#[error("Le fichier `script.ssv` est inaccessible en lecture (inexistant ou pas de droits d'accès).")]
|
||||||
|
FileMissingScriptSsv = 0xF613, // script.ssv
|
||||||
|
#[error("La version du fichier `tablebin.smc` est incompatible avec la bibliothèque des SSV.")]
|
||||||
|
FileVersionIncompatibleTablebinMsc = 0xF620, // tablebin.smc
|
||||||
|
#[error("La version du fichier `scripts.sms` est incompatible avec la bibliothèque des SSV.")]
|
||||||
|
FileVersionIncompatibleScriptsSms = 0xF621, // scripts.sms
|
||||||
|
#[error("La version du fichier `tablebin.ssv` est incompatible avec la bibliothèque des SSV.")]
|
||||||
|
FileVersionIncompatibleTablebinSsv = 0xF622, // tablebin.ssv
|
||||||
|
#[error("La version du fichier `script.ssv` est incompatible avec la bibliothèque des SSV.")]
|
||||||
|
FileVersionIncompatibleScriptSsv = 0xF623, // script.ssv
|
||||||
|
#[error("L'intégrité du fichier `tablebin.smc` est incorrecte.")]
|
||||||
|
FileIntegrityIncorrectTablebinMsc = 0xF630, // tablebin.smc
|
||||||
|
#[error("L'intégrité du fichier `scripts.sms` est incorrecte.")]
|
||||||
|
FileIntegrityIncorrectScriptsSms = 0xF631, // scripts.sms
|
||||||
|
#[error("L'intégrité du fichier `tablebin.ssv` est incorrecte.")]
|
||||||
|
FileIntegrityIncorrectTablebinSsv = 0xF632, // tablebin.ssv
|
||||||
|
#[error("L'intégrité du fichier `script.ssv` est incorrecte.")]
|
||||||
|
FileIntegrityIncorrectScriptSsv = 0xF633, // script.ssv
|
||||||
|
#[error("La structure interne du fichier `tablebin.smc` est invalide.")]
|
||||||
|
FileStructureInvalidTablebinMsc = 0xF640, // tablebin.smc
|
||||||
|
#[error("La structure interne du fichier `scripts.sms` est invalide.")]
|
||||||
|
FileStructureInvalidScriptsSms = 0xF641, // scripts.sms
|
||||||
|
#[error("La structure interne du fichier `tablebin.ssv` est invalide.")]
|
||||||
|
FileStructureInvalidTablebinSsv = 0xF642, // tablebin.ssv
|
||||||
|
#[error("La structure interne du fichier `script.ssv` est invalide.")]
|
||||||
|
FileStructureInvalidScriptSsv = 0xF643, // script.ssv
|
||||||
|
#[error("Le fichier `tablebin.smc` n'a pas pu être chargé en mémoire. Essayez de libérer de la mémoire.")]
|
||||||
|
FileLoadFailedTablebinMsc = 0xF650, // tablebin.smc
|
||||||
|
#[error("Le fichier `scripts.sms` n'a pas pu être chargé en mémoire. Essayez de libérer de la mémoire.")]
|
||||||
|
FileLoadFailedScriptsSms = 0xF651, // scripts.sms
|
||||||
|
#[error("Le fichier `tablebin.ssv` n'a pas pu être chargé en mémoire. Essayez de libérer de la mémoire.")]
|
||||||
|
FileLoadFailedTablebinSsv = 0xF652, // tablebin.ssv
|
||||||
|
#[error("Le fichier `script.ssv` n'a pas pu être chargé en mémoire. Essayez de libérer de la mémoire.")]
|
||||||
|
FileLoadFailedScriptSsv = 0xF653, // script.ssv
|
||||||
|
#[error("Le nom du fichier `tablebin.smc` est invalide.")]
|
||||||
|
FileNameInvalidTablebinMsc = 0xF660, // tablebin.smc
|
||||||
|
#[error("Le nom du fichier `scripts.sms` est invalide.")]
|
||||||
|
FileNameInvalidScriptsSms = 0xF661, // scripts.sms
|
||||||
|
#[error("Le nom du fichier `tablebin.ssv` est invalide.")]
|
||||||
|
FileNameInvalidTablebinSsv = 0xF662, // tablebin.ssv
|
||||||
|
#[error("Le nom du fichier `script.ssv` est invalide.")]
|
||||||
|
FileNameInvalidScriptSsv = 0xF663, // script.ssv
|
||||||
|
#[error("La fonction Initialiser Librairie est déjà appelée.")]
|
||||||
|
FunctionInitLib2AlreadyCalled = 0xF670, // Warning
|
||||||
|
#[error("Le fichier SESAM.INI est inaccessible en lecture (fichier ou droit d’accès manquant) ou ne contient pas le chemin des tables binaires des SSV.")]
|
||||||
|
SesamIniMissingFileOrTablebinPath = 0xF680,
|
||||||
|
#[error("Le chemin du répertoire de travail est absent du fichier SESAM.INI.")]
|
||||||
|
SesamIniMissingWorkDir = 0xF6F1,
|
||||||
|
#[error("Les fichiers d’extension adm ne sont pas accessibles en écriture.")]
|
||||||
|
AdmFilesNotWritable = 0xF6F2, // Warning
|
||||||
|
#[error("Aucune version de FSV du socle technique trouvé. Vérifier que la version du fichier script.sms est bonne.")]
|
||||||
|
NoFsvVersionFound = 0xF6F4,
|
||||||
|
#[error("Librairie SGD absente ou incomplète.")]
|
||||||
|
LibraryMissingOrIncompleteSGD = 0xF6F5,
|
||||||
|
#[error("Librairie SMC absente ou incomplète.")]
|
||||||
|
LibraryMissingOrIncompleteSMC = 0xF6F6,
|
||||||
|
#[error("Librairie SJS absente ou incomplète.")]
|
||||||
|
LibraryMissingOrIncompleteSJS = 0xF6F7,
|
||||||
|
#[error("Librairie SMS absente ou incomplète.")]
|
||||||
|
LibraryMissingOrIncompleteSMS = 0xF6F8,
|
||||||
|
#[error("Section MGC absente / clé RepertoireConfigTrace absente / fichier log4crc.xml non trouvé à l’emplacement indiqué par la clé RepertoireConfigTrace du fichier SESAM.INI.")]
|
||||||
|
SesamIniTracingConfigMissing = 0xFF22, // Warning
|
||||||
|
#[error("Interface Full PC/SC : problème de chargement de la librairie cryptographique ou erreur retournée par la librairie cryptographique.")]
|
||||||
|
PCSCInterfaceCryptoLibraryError = 0xFF25,
|
||||||
|
#[error("Valorisation incorrecte des paramètres de gestion de l'accès aux ressources dans le SESAM.INI. Vérifier les valeurs des clés tempoexclusivite, repetitionexclusivite, tempoexclusivitePCSC, repetitionexclusivitePCSC")]
|
||||||
|
SesamIniResourceAccessParamsIncorrect = 0xFF2A,
|
||||||
|
#[num_enum(catch_all)]
|
||||||
|
#[error("Erreur inattendue de la librairie SSV (code d'erreur: {0}).")]
|
||||||
|
Unexpected(u16),
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_code_ranges() {
|
||||||
|
let error_code = 0xFFF1;
|
||||||
|
let error = SSVErrorCodes::from(error_code);
|
||||||
|
assert_eq!(error, SSVErrorCodes::SSVInternalError);
|
||||||
|
|
||||||
|
let error_code = 0xFFF8;
|
||||||
|
let error = SSVErrorCodes::from(error_code);
|
||||||
|
assert_eq!(error, SSVErrorCodes::SSVInternalError);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_catch_all() {
|
||||||
|
let error_code = 0xFBFF; // Not a valid error code
|
||||||
|
let error = SSVErrorCodes::from(error_code);
|
||||||
|
assert_eq!(error, SSVErrorCodes::Unexpected(0xFBFF));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
317
crates/fsv/src/ssv/mod.rs
Normal file
317
crates/fsv/src/ssv/mod.rs
Normal file
@ -0,0 +1,317 @@
|
|||||||
|
use std::{ffi::CString, ptr};
|
||||||
|
|
||||||
|
use thiserror::Error;
|
||||||
|
|
||||||
|
use fsv_sys::{
|
||||||
|
get_library_path,
|
||||||
|
Error as FsvError,
|
||||||
|
SSVLibrary,
|
||||||
|
SSVLibraryCommon,
|
||||||
|
SupportedFsvVersion,
|
||||||
|
V1_40_13,
|
||||||
|
V1_40_14
|
||||||
|
};
|
||||||
|
|
||||||
|
mod errors_ssv;
|
||||||
|
|
||||||
|
pub use errors_ssv::SSVErrorCodes;
|
||||||
|
use crate::fsv_parsing::prelude::*;
|
||||||
|
|
||||||
|
#[derive(Error, Debug)]
|
||||||
|
pub enum Error {
|
||||||
|
#[error(transparent)]
|
||||||
|
FSVSysLibrary(#[from] FsvError),
|
||||||
|
#[error(transparent)]
|
||||||
|
SSVError(#[from] SSVErrorCodes),
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Enum to hold the different versions of the SSV library
|
||||||
|
pub enum SsvLibraryVersion {
|
||||||
|
V1_40_13(SSVLibrary<V1_40_13>),
|
||||||
|
V1_40_14(SSVLibrary<V1_40_14>),
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Struct to hold the SSV library and access its functions
|
||||||
|
pub struct SSV {
|
||||||
|
library: SsvLibraryVersion,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl SSV {
|
||||||
|
const CPS_READER_NAME: &'static str = "Gemalto PC Twin Reader (645D94C3) 00 00";
|
||||||
|
const VITALE_READER_NAME: &'static str = "Gemalto PC Twin Reader (645D94C3) 00 00"; // TODO: Change this to the correct reader name
|
||||||
|
|
||||||
|
pub fn new(version: SupportedFsvVersion) -> Result<Self, Error> {
|
||||||
|
let library = match version {
|
||||||
|
SupportedFsvVersion::V1_40_13 => {
|
||||||
|
let lib_path = get_library_path(&version);
|
||||||
|
let library = SSVLibrary::<V1_40_13>::new(&lib_path)?;
|
||||||
|
SsvLibraryVersion::V1_40_13(library)
|
||||||
|
},
|
||||||
|
SupportedFsvVersion::V1_40_14 => {
|
||||||
|
let lib_path = get_library_path(&version);
|
||||||
|
let library = SSVLibrary::<V1_40_14>::new(&lib_path)?;
|
||||||
|
SsvLibraryVersion::V1_40_14(library)
|
||||||
|
},
|
||||||
|
};
|
||||||
|
Ok(Self {
|
||||||
|
library,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
/// # Initialize the SSV library
|
||||||
|
/// Implement: SSV_InitLIB2
|
||||||
|
pub fn init_library(&self, sesam_ini_path: &str) -> Result<(), Error> {
|
||||||
|
let sesam_ini_path = CString::new(sesam_ini_path).expect("CString::new failed");
|
||||||
|
let result = match &self.library {
|
||||||
|
SsvLibraryVersion::V1_40_13(library) => {
|
||||||
|
unsafe { library.ssv_init_lib2(sesam_ini_path.as_ptr()) }?
|
||||||
|
},
|
||||||
|
SsvLibraryVersion::V1_40_14(library) => {
|
||||||
|
unsafe { library.ssv_init_lib2(sesam_ini_path.as_ptr()) }?
|
||||||
|
},
|
||||||
|
};
|
||||||
|
if result != 0 {
|
||||||
|
let error = SSVErrorCodes::from(result);
|
||||||
|
return Err(Error::SSVError(error));
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// # Read the CPS card
|
||||||
|
/// Implement: SSV_LireCartePS
|
||||||
|
pub fn read_professional_card(&self, pin_code: &str) -> Result<Data, Error> {
|
||||||
|
let pin_code = CString::new(pin_code).expect("CString::new failed");
|
||||||
|
let cps_pcsc_reader_name = CString::new(SSV::CPS_READER_NAME).expect("CString::new failed");
|
||||||
|
let vitale_pcsc_reader_name = CString::new(SSV::VITALE_READER_NAME).expect("CString::new failed");
|
||||||
|
|
||||||
|
let mut out_buffer_ptr: *mut libc::c_void = ptr::null_mut();
|
||||||
|
let mut out_buffer_size: libc::size_t = 0;
|
||||||
|
|
||||||
|
let result = match &self.library {
|
||||||
|
SsvLibraryVersion::V1_40_13(library) => {
|
||||||
|
unsafe { library.ssv_lire_carte_ps(
|
||||||
|
cps_pcsc_reader_name.as_ptr(),
|
||||||
|
vitale_pcsc_reader_name.as_ptr(),
|
||||||
|
pin_code.as_ptr(),
|
||||||
|
&mut out_buffer_ptr,
|
||||||
|
&mut out_buffer_size)
|
||||||
|
}?
|
||||||
|
},
|
||||||
|
SsvLibraryVersion::V1_40_14(library) => {
|
||||||
|
unsafe { library.ssv_lire_carte_ps(
|
||||||
|
cps_pcsc_reader_name.as_ptr(),
|
||||||
|
vitale_pcsc_reader_name.as_ptr(),
|
||||||
|
pin_code.as_ptr(),
|
||||||
|
&mut out_buffer_ptr,
|
||||||
|
&mut out_buffer_size)
|
||||||
|
}?
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
if result != 0 {
|
||||||
|
// Free memory
|
||||||
|
unsafe { libc::free(out_buffer_ptr) };
|
||||||
|
let error = SSVErrorCodes::from(result);
|
||||||
|
return Err(Error::SSVError(error));
|
||||||
|
}
|
||||||
|
// Parse the buffer into a Data struct
|
||||||
|
let buffer = unsafe { std::slice::from_raw_parts(out_buffer_ptr as *const u8, out_buffer_size) };
|
||||||
|
let (_rest, cps_blocks) = Data::from_bytes((buffer, 0)).unwrap();
|
||||||
|
|
||||||
|
// Free memory
|
||||||
|
unsafe { libc::free(out_buffer_ptr) };
|
||||||
|
Ok(cps_blocks)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// # Get the configuration of the SSV library
|
||||||
|
/// Implement: SSV_LireConfig
|
||||||
|
pub fn get_config(&self) -> Result<Data, Error> {
|
||||||
|
let mut out_buffer_ptr: *mut libc::c_void = ptr::null_mut();
|
||||||
|
let mut out_buffer_size: libc::size_t = 0;
|
||||||
|
|
||||||
|
let result = match &self.library {
|
||||||
|
SsvLibraryVersion::V1_40_13(library) => {
|
||||||
|
unsafe { library.ssv_lire_config(&mut out_buffer_ptr, &mut out_buffer_size) }?
|
||||||
|
},
|
||||||
|
SsvLibraryVersion::V1_40_14(library) => {
|
||||||
|
unsafe { library.ssv_lire_config(&mut out_buffer_ptr, &mut out_buffer_size) }?
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
if result != 0 {
|
||||||
|
// Free memory
|
||||||
|
unsafe { libc::free(out_buffer_ptr) };
|
||||||
|
let error = SSVErrorCodes::from(result);
|
||||||
|
return Err(Error::SSVError(error));
|
||||||
|
}
|
||||||
|
// Parse the buffer into a Data struct
|
||||||
|
let buffer = unsafe { std::slice::from_raw_parts(out_buffer_ptr as *const u8, out_buffer_size) };
|
||||||
|
let (_rest, config_blocks) = Data::from_bytes((buffer, 0)).unwrap();
|
||||||
|
|
||||||
|
// Free memory
|
||||||
|
unsafe { libc::free(out_buffer_ptr) };
|
||||||
|
Ok(config_blocks)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn get_vitale_card_rights(&self, pin_code: &str) -> Result<Data, Error> {
|
||||||
|
let pin_code = CString::new(pin_code).expect("CString::new failed");
|
||||||
|
let cps_pcsc_reader_name = CString::new(SSV::CPS_READER_NAME).expect("CString::new failed");
|
||||||
|
let vitale_pcsc_reader_name = CString::new(SSV::VITALE_READER_NAME).expect("CString::new failed");
|
||||||
|
// Today's date, in the format YYYYMMDD
|
||||||
|
let today = chrono::Local::now().format("%Y%m%d").to_string();
|
||||||
|
let date_consultation = CString::new(today).expect("CString::new failed");
|
||||||
|
|
||||||
|
let mut out_buffer_ptr: *mut libc::c_void = ptr::null_mut();
|
||||||
|
let mut out_buffer_size: libc::size_t = 0;
|
||||||
|
|
||||||
|
let result = match &self.library {
|
||||||
|
SsvLibraryVersion::V1_40_13(library) => {
|
||||||
|
unsafe { library.ssv_lire_droits_vitale(
|
||||||
|
cps_pcsc_reader_name.as_ptr(),
|
||||||
|
vitale_pcsc_reader_name.as_ptr(),
|
||||||
|
pin_code.as_ptr(),
|
||||||
|
date_consultation.as_ptr(),
|
||||||
|
&mut out_buffer_ptr,
|
||||||
|
&mut out_buffer_size)
|
||||||
|
}?
|
||||||
|
},
|
||||||
|
SsvLibraryVersion::V1_40_14(library) => {
|
||||||
|
unsafe { library.ssv_lire_droits_vitale(
|
||||||
|
cps_pcsc_reader_name.as_ptr(),
|
||||||
|
vitale_pcsc_reader_name.as_ptr(),
|
||||||
|
pin_code.as_ptr(),
|
||||||
|
date_consultation.as_ptr(),
|
||||||
|
&mut out_buffer_ptr,
|
||||||
|
&mut out_buffer_size)
|
||||||
|
}?
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
if result != 0 {
|
||||||
|
// Free memory
|
||||||
|
unsafe { libc::free(out_buffer_ptr) };
|
||||||
|
let error = SSVErrorCodes::from(result);
|
||||||
|
return Err(Error::SSVError(error));
|
||||||
|
}
|
||||||
|
// Parse the buffer into a Data struct
|
||||||
|
let buffer = unsafe { std::slice::from_raw_parts(out_buffer_ptr as *const u8, out_buffer_size) };
|
||||||
|
////////////////////////////
|
||||||
|
println!("{:?}", buffer);
|
||||||
|
////////////////////////////
|
||||||
|
let (_rest, vitale_blocks) = Data::from_bytes((buffer, 0)).unwrap();
|
||||||
|
|
||||||
|
// Free memory
|
||||||
|
unsafe { libc::free(out_buffer_ptr) };
|
||||||
|
Ok(vitale_blocks)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use std::env;
|
||||||
|
|
||||||
|
use utils::config::load_config;
|
||||||
|
use anyhow::{bail, Result};
|
||||||
|
|
||||||
|
use crate::fsv_parsing::{blocks::DataGroup, groups::ssv_lire_carte_ps::{group_1_holder::CardPSType, group_2_situation::{PracticeMode, SpecialtyCode}}};
|
||||||
|
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
mod setup {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
pub fn init() -> Result<SSV> {
|
||||||
|
load_config(None)?;
|
||||||
|
let sesam_ini_path = env::var("SESAM_INI_PATH").expect("SESAM_INI_PATH must be set");
|
||||||
|
let lib = SSV::new(SupportedFsvVersion::V1_40_13)?;
|
||||||
|
lib.init_library(&sesam_ini_path)?;
|
||||||
|
Ok(lib)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
#[ignore="Not working with other tests using SSV library in parallel - Need to fix"]
|
||||||
|
// We should implement a way to initialize the library only once
|
||||||
|
// Or implement them sequentially with [serial_test crate](https://docs.rs/serial_test/latest/serial_test)
|
||||||
|
fn test_init_library() -> Result<()> {
|
||||||
|
setup::init()?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
#[ignore="
|
||||||
|
WARNING: Read the card with PIN 1234 - Risk of blocking the card if it's not the right card
|
||||||
|
WARNING: This test will only work with GILBERT's PHARMOFFICE card (titulaire kit pharmacie)
|
||||||
|
"]
|
||||||
|
fn test_read_professional_card_good_pin() -> Result<()> {
|
||||||
|
let lib = setup::init()?;
|
||||||
|
let pin_code = "1234";
|
||||||
|
let cps_blocks = lib.read_professional_card(pin_code)?;
|
||||||
|
// Check the first group is the holder group
|
||||||
|
let holder_group = cps_blocks.blocks.first().unwrap();
|
||||||
|
assert_eq!(holder_group.header.group_id.0, 1);
|
||||||
|
let holder_content = match &holder_group.content {
|
||||||
|
DataGroup::LireCartePS_Group1_Holder(content) => { content },
|
||||||
|
_ => bail!("Wrong group type"),
|
||||||
|
};
|
||||||
|
assert_eq!(holder_content.card_type, CardPSType::CPS, "Card type");
|
||||||
|
assert_eq!(holder_content.holder_firstname.0, "GILBERT", "Holder firstname");
|
||||||
|
// Check the second group is a situation group
|
||||||
|
let situation_group = cps_blocks.blocks.get(1).unwrap();
|
||||||
|
assert_eq!(situation_group.header.group_id.0, 2);
|
||||||
|
let situation_content = match &situation_group.content {
|
||||||
|
DataGroup::LireCartePS_Group2_Situation(content) => { content },
|
||||||
|
_ => bail!("Wrong group type"),
|
||||||
|
};
|
||||||
|
assert_eq!(situation_content.practice_mode, PracticeMode::Liberal, "Practice mode");
|
||||||
|
assert_eq!(situation_content.specialty_code, SpecialtyCode::PharmacieDOfficine, "Specialty code");
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
#[ignore="WARNING: Read the card with PIN 0000 - Risk of blocking the card if it's not the right card"]
|
||||||
|
fn test_read_professional_card_bad_pin() -> Result<()> {
|
||||||
|
let lib = setup::init()?;
|
||||||
|
let pin_code = "0000";
|
||||||
|
// Should return an error
|
||||||
|
let err = lib.read_professional_card(pin_code).unwrap_err();
|
||||||
|
assert_eq!(err.to_string(), "Le code porteur présenté est erroné.");
|
||||||
|
match err {
|
||||||
|
Error::SSVError(err) => {
|
||||||
|
assert_eq!(err as SSVErrorCodes, SSVErrorCodes::CPSPinWrong);
|
||||||
|
},
|
||||||
|
_ => bail!("Error type is not SSVError"),
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
// #[ignore="Needs a valid FSV installation"]
|
||||||
|
fn test_get_config() -> Result<()> {
|
||||||
|
let lib = setup::init()?;
|
||||||
|
let data = lib.get_config()?;
|
||||||
|
// I don't know what to assert here ...
|
||||||
|
let header_group = data.blocks.first().unwrap();
|
||||||
|
assert_eq!(header_group.header.group_id.0, 60);
|
||||||
|
let header_content = match &header_group.content {
|
||||||
|
DataGroup::LireConfig_Group60_ConfigHeader(content) => { content },
|
||||||
|
_ => bail!("Wrong group type"),
|
||||||
|
};
|
||||||
|
assert_eq!(header_content.ssv_version.0.version, "07");
|
||||||
|
assert_eq!(header_content.ssv_version.0.revision, "20");
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
#[ignore="
|
||||||
|
WARNING: Read the card with PIN 1234 - Risk of blocking the card if it's not the right card
|
||||||
|
WARNING: This test needs a CPS and a VITALE card available simultaneously
|
||||||
|
"]
|
||||||
|
fn test_get_vitale_card_rights() -> Result<()> {
|
||||||
|
let lib = setup::init()?;
|
||||||
|
let pin_code = "1234";
|
||||||
|
let _cps_blocks = lib.read_professional_card(pin_code)?;
|
||||||
|
let _vitale_blocks = lib.get_vitale_card_rights(pin_code)?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,97 @@
|
|||||||
|
---
|
||||||
|
source: crates/fsv/tests/test_ssv.rs
|
||||||
|
expression: cps_blocks
|
||||||
|
---
|
||||||
|
Data {
|
||||||
|
blocks: [
|
||||||
|
DataBlock {
|
||||||
|
header: BlockHeader {
|
||||||
|
group_id: GroupId(
|
||||||
|
1,
|
||||||
|
),
|
||||||
|
data_size: 36,
|
||||||
|
},
|
||||||
|
content: LireCartePS_Group1_Holder(
|
||||||
|
Holder {
|
||||||
|
card_type: CPS,
|
||||||
|
national_id_type: RPPS,
|
||||||
|
national_id: AlphaNumericString(
|
||||||
|
"99700619010",
|
||||||
|
),
|
||||||
|
national_id_key: AlphaNumericString(
|
||||||
|
"0",
|
||||||
|
),
|
||||||
|
civility_code: Monsieur,
|
||||||
|
holder_lastname: AlphaNumericString(
|
||||||
|
"DOC0061901",
|
||||||
|
),
|
||||||
|
holder_firstname: AlphaNumericString(
|
||||||
|
"KIT",
|
||||||
|
),
|
||||||
|
category_card: Unknown,
|
||||||
|
},
|
||||||
|
),
|
||||||
|
},
|
||||||
|
DataBlock {
|
||||||
|
header: BlockHeader {
|
||||||
|
group_id: GroupId(
|
||||||
|
2,
|
||||||
|
),
|
||||||
|
data_size: 84,
|
||||||
|
},
|
||||||
|
content: LireCartePS_Group2_Situation(
|
||||||
|
Situation {
|
||||||
|
id: RawByte(
|
||||||
|
2,
|
||||||
|
),
|
||||||
|
practice_mode: Liberal,
|
||||||
|
practice_status_raw: NumericString(
|
||||||
|
"1",
|
||||||
|
),
|
||||||
|
activity_sector: CabinetIndividuel,
|
||||||
|
structure_id_type: RPPSCabinet,
|
||||||
|
structure_id: AlphaNumericString(
|
||||||
|
"99700619010009",
|
||||||
|
),
|
||||||
|
structure_id_key: NumericString(
|
||||||
|
"0",
|
||||||
|
),
|
||||||
|
structure_name: AlphaNumericString(
|
||||||
|
"CABINET M DOC0061901",
|
||||||
|
),
|
||||||
|
ps_billing_number: NumericString(
|
||||||
|
"00102901",
|
||||||
|
),
|
||||||
|
ps_billing_number_key: NumericString(
|
||||||
|
"6",
|
||||||
|
),
|
||||||
|
ps_replacement_number: AlphaNumericString(
|
||||||
|
"",
|
||||||
|
),
|
||||||
|
ps_replacement_number_key: NumericString(
|
||||||
|
"0",
|
||||||
|
),
|
||||||
|
convention_code: Conventionne,
|
||||||
|
specialty_code: MedecineGenerale,
|
||||||
|
rate_zone_code_raw: NumericString(
|
||||||
|
"24",
|
||||||
|
),
|
||||||
|
ik_zone_code: IndemniteKilometriquePlaine,
|
||||||
|
approval_code_1: PasAgrementRadio,
|
||||||
|
approval_code_2_raw: NumericString(
|
||||||
|
"0",
|
||||||
|
),
|
||||||
|
approval_code_3_raw: NumericString(
|
||||||
|
"0",
|
||||||
|
),
|
||||||
|
invoice_signature_permission: NumericString(
|
||||||
|
"1",
|
||||||
|
),
|
||||||
|
lot_signature_permission: NumericString(
|
||||||
|
"1",
|
||||||
|
),
|
||||||
|
},
|
||||||
|
),
|
||||||
|
},
|
||||||
|
],
|
||||||
|
}
|
@ -0,0 +1,97 @@
|
|||||||
|
---
|
||||||
|
source: crates/fsv/tests/test_ssv.rs
|
||||||
|
expression: cps_blocks
|
||||||
|
---
|
||||||
|
Data {
|
||||||
|
blocks: [
|
||||||
|
DataBlock {
|
||||||
|
header: BlockHeader {
|
||||||
|
group_id: GroupId(
|
||||||
|
1,
|
||||||
|
),
|
||||||
|
data_size: 55,
|
||||||
|
},
|
||||||
|
content: LireCartePS_Group1_Holder(
|
||||||
|
Holder {
|
||||||
|
card_type: CPS,
|
||||||
|
national_id_type: RPPS,
|
||||||
|
national_id: AlphaNumericString(
|
||||||
|
"99700593694",
|
||||||
|
),
|
||||||
|
national_id_key: AlphaNumericString(
|
||||||
|
"4",
|
||||||
|
),
|
||||||
|
civility_code: Madame,
|
||||||
|
holder_lastname: AlphaNumericString(
|
||||||
|
"ADJOINTPHARM RPPS0059369",
|
||||||
|
),
|
||||||
|
holder_firstname: AlphaNumericString(
|
||||||
|
"PATRICIA",
|
||||||
|
),
|
||||||
|
category_card: Unknown,
|
||||||
|
},
|
||||||
|
),
|
||||||
|
},
|
||||||
|
DataBlock {
|
||||||
|
header: BlockHeader {
|
||||||
|
group_id: GroupId(
|
||||||
|
2,
|
||||||
|
),
|
||||||
|
data_size: 93,
|
||||||
|
},
|
||||||
|
content: LireCartePS_Group2_Situation(
|
||||||
|
Situation {
|
||||||
|
id: RawByte(
|
||||||
|
1,
|
||||||
|
),
|
||||||
|
practice_mode: Salarie,
|
||||||
|
practice_status_raw: NumericString(
|
||||||
|
"2",
|
||||||
|
),
|
||||||
|
activity_sector: PharmacieDOfficine,
|
||||||
|
structure_id_type: FINESS,
|
||||||
|
structure_id: AlphaNumericString(
|
||||||
|
"0B0246286",
|
||||||
|
),
|
||||||
|
structure_id_key: NumericString(
|
||||||
|
"6",
|
||||||
|
),
|
||||||
|
structure_name: AlphaNumericString(
|
||||||
|
"PHARMACIE DE LA GARE ROUTIERE24628",
|
||||||
|
),
|
||||||
|
ps_billing_number: NumericString(
|
||||||
|
"00209368",
|
||||||
|
),
|
||||||
|
ps_billing_number_key: NumericString(
|
||||||
|
"0",
|
||||||
|
),
|
||||||
|
ps_replacement_number: AlphaNumericString(
|
||||||
|
"",
|
||||||
|
),
|
||||||
|
ps_replacement_number_key: NumericString(
|
||||||
|
"0",
|
||||||
|
),
|
||||||
|
convention_code: Conventionne,
|
||||||
|
specialty_code: PharmacieDOfficine,
|
||||||
|
rate_zone_code_raw: NumericString(
|
||||||
|
"10",
|
||||||
|
),
|
||||||
|
ik_zone_code: PasDIndemniteKilometrique,
|
||||||
|
approval_code_1: PasAgrementRadio,
|
||||||
|
approval_code_2_raw: NumericString(
|
||||||
|
"0",
|
||||||
|
),
|
||||||
|
approval_code_3_raw: NumericString(
|
||||||
|
"0",
|
||||||
|
),
|
||||||
|
invoice_signature_permission: NumericString(
|
||||||
|
"1",
|
||||||
|
),
|
||||||
|
lot_signature_permission: NumericString(
|
||||||
|
"1",
|
||||||
|
),
|
||||||
|
},
|
||||||
|
),
|
||||||
|
},
|
||||||
|
],
|
||||||
|
}
|
@ -0,0 +1,97 @@
|
|||||||
|
---
|
||||||
|
source: crates/fsv/tests/test_ssv.rs
|
||||||
|
expression: cps_blocks
|
||||||
|
---
|
||||||
|
Data {
|
||||||
|
blocks: [
|
||||||
|
DataBlock {
|
||||||
|
header: BlockHeader {
|
||||||
|
group_id: GroupId(
|
||||||
|
1,
|
||||||
|
),
|
||||||
|
data_size: 49,
|
||||||
|
},
|
||||||
|
content: LireCartePS_Group1_Holder(
|
||||||
|
Holder {
|
||||||
|
card_type: CPE,
|
||||||
|
national_id_type: FINESS,
|
||||||
|
national_id: AlphaNumericString(
|
||||||
|
"0B0246286/CPET00001",
|
||||||
|
),
|
||||||
|
national_id_key: AlphaNumericString(
|
||||||
|
"6",
|
||||||
|
),
|
||||||
|
civility_code: Monsieur,
|
||||||
|
holder_lastname: AlphaNumericString(
|
||||||
|
"EMPLOYE246280001",
|
||||||
|
),
|
||||||
|
holder_firstname: AlphaNumericString(
|
||||||
|
"AA",
|
||||||
|
),
|
||||||
|
category_card: Unknown,
|
||||||
|
},
|
||||||
|
),
|
||||||
|
},
|
||||||
|
DataBlock {
|
||||||
|
header: BlockHeader {
|
||||||
|
group_id: GroupId(
|
||||||
|
2,
|
||||||
|
),
|
||||||
|
data_size: 93,
|
||||||
|
},
|
||||||
|
content: LireCartePS_Group2_Situation(
|
||||||
|
Situation {
|
||||||
|
id: RawByte(
|
||||||
|
1,
|
||||||
|
),
|
||||||
|
practice_mode: Salarie,
|
||||||
|
practice_status_raw: NumericString(
|
||||||
|
"0",
|
||||||
|
),
|
||||||
|
activity_sector: PharmacieDOfficine,
|
||||||
|
structure_id_type: FINESS,
|
||||||
|
structure_id: AlphaNumericString(
|
||||||
|
"0B0246286",
|
||||||
|
),
|
||||||
|
structure_id_key: NumericString(
|
||||||
|
"6",
|
||||||
|
),
|
||||||
|
structure_name: AlphaNumericString(
|
||||||
|
"PHARMACIE DE LA GARE ROUTIERE24628",
|
||||||
|
),
|
||||||
|
ps_billing_number: NumericString(
|
||||||
|
"00209368",
|
||||||
|
),
|
||||||
|
ps_billing_number_key: NumericString(
|
||||||
|
"0",
|
||||||
|
),
|
||||||
|
ps_replacement_number: AlphaNumericString(
|
||||||
|
"",
|
||||||
|
),
|
||||||
|
ps_replacement_number_key: NumericString(
|
||||||
|
"0",
|
||||||
|
),
|
||||||
|
convention_code: Conventionne,
|
||||||
|
specialty_code: PharmacieDOfficine,
|
||||||
|
rate_zone_code_raw: NumericString(
|
||||||
|
"10",
|
||||||
|
),
|
||||||
|
ik_zone_code: PasDIndemniteKilometrique,
|
||||||
|
approval_code_1: PasAgrementRadio,
|
||||||
|
approval_code_2_raw: NumericString(
|
||||||
|
"0",
|
||||||
|
),
|
||||||
|
approval_code_3_raw: NumericString(
|
||||||
|
"0",
|
||||||
|
),
|
||||||
|
invoice_signature_permission: NumericString(
|
||||||
|
"1",
|
||||||
|
),
|
||||||
|
lot_signature_permission: NumericString(
|
||||||
|
"0",
|
||||||
|
),
|
||||||
|
},
|
||||||
|
),
|
||||||
|
},
|
||||||
|
],
|
||||||
|
}
|
@ -0,0 +1,97 @@
|
|||||||
|
---
|
||||||
|
source: crates/fsv/tests/test_ssv.rs
|
||||||
|
expression: cps_blocks
|
||||||
|
---
|
||||||
|
Data {
|
||||||
|
blocks: [
|
||||||
|
DataBlock {
|
||||||
|
header: BlockHeader {
|
||||||
|
group_id: GroupId(
|
||||||
|
1,
|
||||||
|
),
|
||||||
|
data_size: 50,
|
||||||
|
},
|
||||||
|
content: LireCartePS_Group1_Holder(
|
||||||
|
Holder {
|
||||||
|
card_type: CPS,
|
||||||
|
national_id_type: RPPS,
|
||||||
|
national_id: AlphaNumericString(
|
||||||
|
"99700520499",
|
||||||
|
),
|
||||||
|
national_id_key: AlphaNumericString(
|
||||||
|
"9",
|
||||||
|
),
|
||||||
|
civility_code: Madame,
|
||||||
|
holder_lastname: AlphaNumericString(
|
||||||
|
"INFIRMIERE RPPS0052049",
|
||||||
|
),
|
||||||
|
holder_firstname: AlphaNumericString(
|
||||||
|
"ALINE",
|
||||||
|
),
|
||||||
|
category_card: Unknown,
|
||||||
|
},
|
||||||
|
),
|
||||||
|
},
|
||||||
|
DataBlock {
|
||||||
|
header: BlockHeader {
|
||||||
|
group_id: GroupId(
|
||||||
|
2,
|
||||||
|
),
|
||||||
|
data_size: 93,
|
||||||
|
},
|
||||||
|
content: LireCartePS_Group2_Situation(
|
||||||
|
Situation {
|
||||||
|
id: RawByte(
|
||||||
|
1,
|
||||||
|
),
|
||||||
|
practice_mode: Liberal,
|
||||||
|
practice_status_raw: NumericString(
|
||||||
|
"1",
|
||||||
|
),
|
||||||
|
activity_sector: CabinetIndividuel,
|
||||||
|
structure_id_type: RPPSCabinet,
|
||||||
|
structure_id: AlphaNumericString(
|
||||||
|
"99700520499002",
|
||||||
|
),
|
||||||
|
structure_id_key: NumericString(
|
||||||
|
"0",
|
||||||
|
),
|
||||||
|
structure_name: AlphaNumericString(
|
||||||
|
"CABINET MME INFIRMIERE0052049",
|
||||||
|
),
|
||||||
|
ps_billing_number: NumericString(
|
||||||
|
"00602049",
|
||||||
|
),
|
||||||
|
ps_billing_number_key: NumericString(
|
||||||
|
"9",
|
||||||
|
),
|
||||||
|
ps_replacement_number: AlphaNumericString(
|
||||||
|
"",
|
||||||
|
),
|
||||||
|
ps_replacement_number_key: NumericString(
|
||||||
|
"0",
|
||||||
|
),
|
||||||
|
convention_code: Conventionne,
|
||||||
|
specialty_code: Infirmier,
|
||||||
|
rate_zone_code_raw: NumericString(
|
||||||
|
"20",
|
||||||
|
),
|
||||||
|
ik_zone_code: IndemniteKilometriqueMontagne,
|
||||||
|
approval_code_1: PasAgrementRadio,
|
||||||
|
approval_code_2_raw: NumericString(
|
||||||
|
"0",
|
||||||
|
),
|
||||||
|
approval_code_3_raw: NumericString(
|
||||||
|
"0",
|
||||||
|
),
|
||||||
|
invoice_signature_permission: NumericString(
|
||||||
|
"1",
|
||||||
|
),
|
||||||
|
lot_signature_permission: NumericString(
|
||||||
|
"1",
|
||||||
|
),
|
||||||
|
},
|
||||||
|
),
|
||||||
|
},
|
||||||
|
],
|
||||||
|
}
|
@ -0,0 +1,97 @@
|
|||||||
|
---
|
||||||
|
source: crates/fsv/tests/test_ssv.rs
|
||||||
|
expression: cps_blocks
|
||||||
|
---
|
||||||
|
Data {
|
||||||
|
blocks: [
|
||||||
|
DataBlock {
|
||||||
|
header: BlockHeader {
|
||||||
|
group_id: GroupId(
|
||||||
|
1,
|
||||||
|
),
|
||||||
|
data_size: 53,
|
||||||
|
},
|
||||||
|
content: LireCartePS_Group1_Holder(
|
||||||
|
Holder {
|
||||||
|
card_type: CPS,
|
||||||
|
national_id_type: RPPS,
|
||||||
|
national_id: AlphaNumericString(
|
||||||
|
"99700593686",
|
||||||
|
),
|
||||||
|
national_id_key: AlphaNumericString(
|
||||||
|
"6",
|
||||||
|
),
|
||||||
|
civility_code: Monsieur,
|
||||||
|
holder_lastname: AlphaNumericString(
|
||||||
|
"PHARMOFFICE RPPS0059368",
|
||||||
|
),
|
||||||
|
holder_firstname: AlphaNumericString(
|
||||||
|
"GILBERT",
|
||||||
|
),
|
||||||
|
category_card: Unknown,
|
||||||
|
},
|
||||||
|
),
|
||||||
|
},
|
||||||
|
DataBlock {
|
||||||
|
header: BlockHeader {
|
||||||
|
group_id: GroupId(
|
||||||
|
2,
|
||||||
|
),
|
||||||
|
data_size: 93,
|
||||||
|
},
|
||||||
|
content: LireCartePS_Group2_Situation(
|
||||||
|
Situation {
|
||||||
|
id: RawByte(
|
||||||
|
1,
|
||||||
|
),
|
||||||
|
practice_mode: Liberal,
|
||||||
|
practice_status_raw: NumericString(
|
||||||
|
"1",
|
||||||
|
),
|
||||||
|
activity_sector: PharmacieDOfficine,
|
||||||
|
structure_id_type: FINESS,
|
||||||
|
structure_id: AlphaNumericString(
|
||||||
|
"0B0246286",
|
||||||
|
),
|
||||||
|
structure_id_key: NumericString(
|
||||||
|
"6",
|
||||||
|
),
|
||||||
|
structure_name: AlphaNumericString(
|
||||||
|
"PHARMACIE DE LA GARE ROUTIERE24628",
|
||||||
|
),
|
||||||
|
ps_billing_number: NumericString(
|
||||||
|
"00209368",
|
||||||
|
),
|
||||||
|
ps_billing_number_key: NumericString(
|
||||||
|
"0",
|
||||||
|
),
|
||||||
|
ps_replacement_number: AlphaNumericString(
|
||||||
|
"",
|
||||||
|
),
|
||||||
|
ps_replacement_number_key: NumericString(
|
||||||
|
"0",
|
||||||
|
),
|
||||||
|
convention_code: Conventionne,
|
||||||
|
specialty_code: PharmacieDOfficine,
|
||||||
|
rate_zone_code_raw: NumericString(
|
||||||
|
"10",
|
||||||
|
),
|
||||||
|
ik_zone_code: PasDIndemniteKilometrique,
|
||||||
|
approval_code_1: PasAgrementRadio,
|
||||||
|
approval_code_2_raw: NumericString(
|
||||||
|
"0",
|
||||||
|
),
|
||||||
|
approval_code_3_raw: NumericString(
|
||||||
|
"0",
|
||||||
|
),
|
||||||
|
invoice_signature_permission: NumericString(
|
||||||
|
"1",
|
||||||
|
),
|
||||||
|
lot_signature_permission: NumericString(
|
||||||
|
"1",
|
||||||
|
),
|
||||||
|
},
|
||||||
|
),
|
||||||
|
},
|
||||||
|
],
|
||||||
|
}
|
174
crates/fsv/tests/test_ssv.rs
Normal file
174
crates/fsv/tests/test_ssv.rs
Normal file
@ -0,0 +1,174 @@
|
|||||||
|
use anyhow::Result;
|
||||||
|
|
||||||
|
use common::read_cps;
|
||||||
|
use fsv::ssv::{Error, SSVErrorCodes, SSV};
|
||||||
|
use insta::assert_debug_snapshot;
|
||||||
|
|
||||||
|
mod common {
|
||||||
|
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
use std::env;
|
||||||
|
|
||||||
|
use fsv::fsv_parsing::Data;
|
||||||
|
use fsv_sys::SupportedFsvVersion;
|
||||||
|
use utils::config::load_config;
|
||||||
|
|
||||||
|
pub fn init() -> Result<SSV> {
|
||||||
|
load_config(None)?;
|
||||||
|
let sesam_ini_path = env::var("SESAM_INI_PATH").expect("SESAM_INI_PATH must be set");
|
||||||
|
let lib = SSV::new(SupportedFsvVersion::V1_40_13)?;
|
||||||
|
lib.init_library(&sesam_ini_path)?;
|
||||||
|
Ok(lib)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn read_cps() -> Result<Data> {
|
||||||
|
let lib = init()?;
|
||||||
|
Ok(lib.read_professional_card("1234")?)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------- PHARMA KIT ----------------
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
#[ignore]
|
||||||
|
fn test_read_cps_pharma_kit_titulaire() -> Result<()> {
|
||||||
|
let cps_blocks = read_cps()?;
|
||||||
|
assert_debug_snapshot!(cps_blocks);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
#[ignore]
|
||||||
|
fn test_read_cps_pharma_kit_adjointe() -> Result<()> {
|
||||||
|
let cps_blocks = read_cps()?;
|
||||||
|
assert_debug_snapshot!(cps_blocks);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
#[ignore]
|
||||||
|
fn test_read_cps_pharma_kit_employe_aa() -> Result<()> {
|
||||||
|
let cps_blocks = read_cps()?;
|
||||||
|
assert_debug_snapshot!(cps_blocks);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
#[ignore]
|
||||||
|
fn test_read_cps_pharma_kit_infirmiere() -> Result<()> {
|
||||||
|
let cps_blocks = read_cps()?;
|
||||||
|
assert_debug_snapshot!(cps_blocks);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------- DEFAULT KIT ----------------
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
#[ignore]
|
||||||
|
fn test_read_cps_default_kit_doc() -> Result<()> {
|
||||||
|
let cps_blocks = read_cps()?;
|
||||||
|
assert_debug_snapshot!(cps_blocks);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
#[ignore]
|
||||||
|
fn test_read_cps_default_kit_directeur() -> Result<()> {
|
||||||
|
let error = read_cps().expect_err("This card should be opposed and not be readable");
|
||||||
|
match error.downcast_ref::<Error>() {
|
||||||
|
Some(Error::SSVError(e)) => {
|
||||||
|
match e {
|
||||||
|
SSVErrorCodes::CPSInvalid => { Ok(()) },
|
||||||
|
_ => panic!("Expected SSVErrorCodes::CPSInvalid, got {:?}", e),
|
||||||
|
}
|
||||||
|
},
|
||||||
|
_ => panic!("Expected Error::SSVError got {:?}", error),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
#[ignore]
|
||||||
|
fn test_read_cps_default_kit_employee_opposee() -> Result<()> {
|
||||||
|
let error = read_cps().expect_err("This card should be opposed and not be readable");
|
||||||
|
match error.downcast_ref::<Error>() {
|
||||||
|
Some(Error::SSVError(e)) => {
|
||||||
|
match e {
|
||||||
|
SSVErrorCodes::SSVInternalError => { Ok(()) },
|
||||||
|
_ => panic!("Expected SSVErrorCodes::SSVInternalError, got {:?}", e),
|
||||||
|
}
|
||||||
|
},
|
||||||
|
_ => panic!("Expected Error::SSVError got {:?}", error),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
#[ignore]
|
||||||
|
fn test_read_cps_default_kit_doc_maximaxima() -> Result<()> {
|
||||||
|
// TODO : debug this card (ConventionCode value is 9)
|
||||||
|
let cps_blocks = read_cps()?;
|
||||||
|
assert_debug_snapshot!(cps_blocks);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
#[ignore]
|
||||||
|
fn test_read_cps_default_kit_orthophoniste() -> Result<()> {
|
||||||
|
let error = read_cps().expect_err("This card should be opposed and not be readable");
|
||||||
|
match error.downcast_ref::<Error>() {
|
||||||
|
Some(Error::SSVError(e)) => {
|
||||||
|
match e {
|
||||||
|
SSVErrorCodes::SSVInternalError => { Ok(()) },
|
||||||
|
_ => panic!("Expected SSVErrorCodes::SSVInternalError, got {:?}", e),
|
||||||
|
}
|
||||||
|
},
|
||||||
|
_ => panic!("Expected Error::SSVError got {:?}", error),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------- CENTRE SANTÉ ----------------
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
#[ignore]
|
||||||
|
fn test_read_cps_centre_sante_kit_directeur() -> Result<()> {
|
||||||
|
// TODO : debug this card (ConventionCode value is 9)
|
||||||
|
let cps_blocks = read_cps()?;
|
||||||
|
assert_debug_snapshot!(cps_blocks);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
#[ignore]
|
||||||
|
fn test_read_cps_centre_sante_kit_doc() -> Result<()> {
|
||||||
|
// TODO : debug this card (ConventionCode value is 9)
|
||||||
|
let cps_blocks = read_cps()?;
|
||||||
|
assert_debug_snapshot!(cps_blocks);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
#[ignore]
|
||||||
|
fn test_read_cps_centre_sante_kit_dentiste() -> Result<()> {
|
||||||
|
// TODO : debug this card (ConventionCode value is 9)
|
||||||
|
let cps_blocks = read_cps()?;
|
||||||
|
assert_debug_snapshot!(cps_blocks);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
#[ignore]
|
||||||
|
fn test_read_cps_centre_sante_kit_assist_vladimir() -> Result<()> {
|
||||||
|
// TODO : debug this card (ConventionCode value is 9)
|
||||||
|
let cps_blocks = read_cps()?;
|
||||||
|
assert_debug_snapshot!(cps_blocks);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
#[ignore]
|
||||||
|
fn test_read_cps_centre_sante_kit_assist_marie() -> Result<()> {
|
||||||
|
// TODO : debug this card (ConventionCode value is 9)
|
||||||
|
let cps_blocks = read_cps()?;
|
||||||
|
assert_debug_snapshot!(cps_blocks);
|
||||||
|
Ok(())
|
||||||
|
}
|
@ -4,10 +4,11 @@ version = "0.1.0"
|
|||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
anyhow = "1.0"
|
anyhow.workspace = true
|
||||||
libc = "0.2"
|
libc = "0.2"
|
||||||
thiserror = "1.0"
|
thiserror.workspace = true
|
||||||
|
|
||||||
utils = { path = "../utils" }
|
utils = { path = "../utils" }
|
||||||
|
|
||||||
[build-dependencies]
|
[build-dependencies]
|
||||||
dotenv = "0.15"
|
dotenv.workspace = true
|
||||||
|
@ -9,7 +9,7 @@ use thiserror::Error;
|
|||||||
use crate::cps::lire_carte;
|
use crate::cps::lire_carte;
|
||||||
use crate::libssv::{SSV_InitLIB2, SSV_LireConfig};
|
use crate::libssv::{SSV_InitLIB2, SSV_LireConfig};
|
||||||
|
|
||||||
use ::utils::config::load_config;
|
use ::utils::config::{load_config, ConfigError};
|
||||||
|
|
||||||
#[derive(Error, Debug)]
|
#[derive(Error, Debug)]
|
||||||
pub enum SSVDemoError {
|
pub enum SSVDemoError {
|
||||||
@ -18,7 +18,7 @@ pub enum SSVDemoError {
|
|||||||
#[error(transparent)]
|
#[error(transparent)]
|
||||||
SSVLibErrorCode(#[from] crate::libssv::LibSSVError),
|
SSVLibErrorCode(#[from] crate::libssv::LibSSVError),
|
||||||
#[error(transparent)]
|
#[error(transparent)]
|
||||||
Anyhow(#[from] anyhow::Error),
|
Configuration(#[from] ConfigError),
|
||||||
}
|
}
|
||||||
|
|
||||||
fn ssv_init_lib_2() -> Result<(), SSVDemoError> {
|
fn ssv_init_lib_2() -> Result<(), SSVDemoError> {
|
||||||
@ -71,7 +71,7 @@ pub fn demo() -> Result<(), SSVDemoError> {
|
|||||||
|
|
||||||
println!("------- Demo for the SSV library --------");
|
println!("------- Demo for the SSV library --------");
|
||||||
|
|
||||||
load_config()?;
|
load_config(None)?;
|
||||||
|
|
||||||
ssv_init_lib_2()?;
|
ssv_init_lib_2()?;
|
||||||
|
|
||||||
|
@ -4,6 +4,7 @@ version = "0.1.0"
|
|||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
anyhow = "1.0"
|
anyhow.workspace = true
|
||||||
directories = "5.0"
|
directories = "5.0"
|
||||||
dotenv = "0.15"
|
dotenv.workspace = true
|
||||||
|
thiserror.workspace = true
|
||||||
|
@ -1,11 +1,23 @@
|
|||||||
use std::{env, path::PathBuf};
|
use std::{env, path::PathBuf, sync::atomic::AtomicBool};
|
||||||
|
|
||||||
use anyhow::{bail, Context, Result};
|
|
||||||
use directories::ProjectDirs;
|
use directories::ProjectDirs;
|
||||||
use dotenv::from_path;
|
use dotenv::from_path;
|
||||||
|
use thiserror::Error;
|
||||||
|
|
||||||
const CONFIG_FILE_NAME: &str = ".env";
|
const CONFIG_FILE_NAME: &str = ".env";
|
||||||
|
|
||||||
|
static CONFIG_INITIALIZED: AtomicBool = AtomicBool::new(false);
|
||||||
|
|
||||||
|
#[derive(Debug, Error)]
|
||||||
|
pub enum ConfigError {
|
||||||
|
#[error("No config file {0} found in the following directories: {1:#?}")]
|
||||||
|
ConfigFileNotFound(String, Vec<PathBuf>),
|
||||||
|
#[error("Failed to load config file: {0}")]
|
||||||
|
LoadConfigError(#[from] dotenv::Error),
|
||||||
|
#[error("Environment variable error: {0}")]
|
||||||
|
EnvVarError(#[from] std::env::VarError),
|
||||||
|
}
|
||||||
|
|
||||||
pub fn get_config_dirs() -> Vec<PathBuf> {
|
pub fn get_config_dirs() -> Vec<PathBuf> {
|
||||||
let mut config_dirs = vec![
|
let mut config_dirs = vec![
|
||||||
PathBuf::from(""), // Current directory
|
PathBuf::from(""), // Current directory
|
||||||
@ -19,7 +31,7 @@ pub fn get_config_dirs() -> Vec<PathBuf> {
|
|||||||
config_dirs
|
config_dirs
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn get_config_files() -> Result<Vec<PathBuf>> {
|
pub fn get_config_files() -> Result<Vec<PathBuf>, ConfigError> {
|
||||||
let config_dirs = get_config_dirs();
|
let config_dirs = get_config_dirs();
|
||||||
let mut config_files = Vec::new();
|
let mut config_files = Vec::new();
|
||||||
for config_dir in config_dirs.iter() {
|
for config_dir in config_dirs.iter() {
|
||||||
@ -29,14 +41,20 @@ pub fn get_config_files() -> Result<Vec<PathBuf>> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if config_files.is_empty() {
|
if config_files.is_empty() {
|
||||||
bail!(
|
return Err(ConfigError::ConfigFileNotFound(
|
||||||
"No config file {CONFIG_FILE_NAME} found in the following directories: {config_dirs:#?}"
|
CONFIG_FILE_NAME.to_string(),
|
||||||
);
|
config_dirs,
|
||||||
|
));
|
||||||
}
|
}
|
||||||
Ok(config_files)
|
Ok(config_files)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn load_config() -> Result<()> {
|
pub fn load_config(force: Option<bool>) -> Result<(), ConfigError> {
|
||||||
|
let force = force.unwrap_or(false);
|
||||||
|
if CONFIG_INITIALIZED.load(std::sync::atomic::Ordering::Relaxed) && force {
|
||||||
|
println!("DEBUG: Config already initialized, skipping");
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
let config_files = get_config_files()?;
|
let config_files = get_config_files()?;
|
||||||
// Load the first config file found
|
// Load the first config file found
|
||||||
// TODO: add a verbose log to list all config files found
|
// TODO: add a verbose log to list all config files found
|
||||||
@ -44,5 +62,7 @@ pub fn load_config() -> Result<()> {
|
|||||||
"DEBUG: Config files found (1st loaded): {:#?}",
|
"DEBUG: Config files found (1st loaded): {:#?}",
|
||||||
config_files
|
config_files
|
||||||
);
|
);
|
||||||
from_path(config_files[0].as_path()).context("Failed to load config file")
|
from_path(config_files[0].as_path()).map_err(ConfigError::LoadConfigError)?;
|
||||||
|
CONFIG_INITIALIZED.store(true, std::sync::atomic::Ordering::Relaxed);
|
||||||
|
Ok(())
|
||||||
}
|
}
|
||||||
|
15
entity/Cargo.toml
Normal file
15
entity/Cargo.toml
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
[package]
|
||||||
|
name = "entity"
|
||||||
|
version = "0.1.0"
|
||||||
|
edition = "2021"
|
||||||
|
|
||||||
|
[lib]
|
||||||
|
name = "entity"
|
||||||
|
path = "src/lib.rs"
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
sea-orm.workspace = true
|
||||||
|
serde.workspace = true
|
||||||
|
|
||||||
|
[dev-dependencies]
|
||||||
|
sea-orm-cli.workspace = true
|
18
entity/src/entities/debug.rs
Normal file
18
entity/src/entities/debug.rs
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
//! `SeaORM` Entity, @generated by sea-orm-codegen 1.0.1
|
||||||
|
|
||||||
|
use sea_orm::entity::prelude::*;
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
|
||||||
|
#[sea_orm(table_name = "debug")]
|
||||||
|
pub struct Model {
|
||||||
|
#[sea_orm(primary_key)]
|
||||||
|
pub id: i32,
|
||||||
|
pub title: String,
|
||||||
|
pub text: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
|
||||||
|
pub enum Relation {}
|
||||||
|
|
||||||
|
impl ActiveModelBehavior for ActiveModel {}
|
5
entity/src/entities/mod.rs
Normal file
5
entity/src/entities/mod.rs
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
//! `SeaORM` Entity, @generated by sea-orm-codegen 1.0.1
|
||||||
|
|
||||||
|
pub mod prelude;
|
||||||
|
|
||||||
|
pub mod debug;
|
3
entity/src/entities/prelude.rs
Normal file
3
entity/src/entities/prelude.rs
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
//! `SeaORM` Entity, @generated by sea-orm-codegen 1.0.1
|
||||||
|
|
||||||
|
pub use super::debug::Entity as Debug;
|
2
entity/src/lib.rs
Normal file
2
entity/src/lib.rs
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
mod entities;
|
||||||
|
pub use entities::*;
|
@ -1,5 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<div>
|
<div>
|
||||||
|
<NuxtLoadingIndicator />
|
||||||
<NuxtRouteAnnouncer />
|
<NuxtRouteAnnouncer />
|
||||||
<NavBar />
|
<NavBar />
|
||||||
<NuxtPage />
|
<NuxtPage />
|
||||||
|
@ -17,6 +17,6 @@
|
|||||||
if (user.avatar) {
|
if (user.avatar) {
|
||||||
return user.avatar;
|
return user.avatar;
|
||||||
}
|
}
|
||||||
return 'https://avatar.iran.liara.run/username?username=' + user.name;
|
return 'https://i.pravatar.cc/150?u=' + user.name;
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
@ -29,15 +29,15 @@
|
|||||||
|
|
||||||
const users: User[] = [
|
const users: User[] = [
|
||||||
{ id: 1, name: 'John Doe', avatar: 'https://img.daisyui.com/images/stock/photo-1534528741775-53994a69daeb.webp' },
|
{ id: 1, name: 'John Doe', avatar: 'https://img.daisyui.com/images/stock/photo-1534528741775-53994a69daeb.webp' },
|
||||||
{ id: 2, name: 'Jane Doe', avatar: 'https://avatar.iran.liara.run/public' },
|
{ id: 2, name: 'Jane Doe', avatar: 'https://i.pravatar.cc/150?u=JANEDOE728' },
|
||||||
{ id: 3, name: 'Michel Moulin', avatar: '' },
|
{ id: 3, name: 'Michel Moulin' },
|
||||||
{ id: 4, name: 'Jean Paris', avatar: '' },
|
{ id: 4, name: 'Jean Paris' },
|
||||||
{ id: 5, name: 'Marie Dupont', avatar: '' },
|
{ id: 5, name: 'Marie Dupont' },
|
||||||
{ id: 6, name: 'Émilie Fournier', avatar: '' },
|
{ id: 6, name: 'Émilie Fournier' },
|
||||||
{ id: 7, name: 'Pierre Lefevre', avatar: '' },
|
{ id: 7, name: 'Pierre Lefevre' },
|
||||||
{ id: 8, name: 'Sophie Lemoine', avatar: '' },
|
{ id: 8, name: 'Sophie Lemoine' },
|
||||||
{ id: 9, name: 'Lucie Simon', avatar: '' },
|
{ id: 9, name: 'Lucie Simon' },
|
||||||
{ id: 10, name: 'Kevin Boucher', avatar: '' },
|
{ id: 10, name: 'Kevin Boucher' },
|
||||||
];
|
];
|
||||||
|
|
||||||
const loginModal = useTemplateRef('login_modal');
|
const loginModal = useTemplateRef('login_modal');
|
||||||
|
@ -6,6 +6,7 @@
|
|||||||
<nav class="navbar-center">
|
<nav class="navbar-center">
|
||||||
<NuxtLink to="/" class="btn btn-ghost">Accueil</NuxtLink>
|
<NuxtLink to="/" class="btn btn-ghost">Accueil</NuxtLink>
|
||||||
<NuxtLink to="/CPS" class="btn btn-ghost">Carte CPS</NuxtLink>
|
<NuxtLink to="/CPS" class="btn btn-ghost">Carte CPS</NuxtLink>
|
||||||
|
<NuxtLink to="/debug" class="btn btn-ghost">Debug</NuxtLink>
|
||||||
</nav>
|
</nav>
|
||||||
<div class="navbar-end">
|
<div class="navbar-end">
|
||||||
<template v-if="!current_user">
|
<template v-if="!current_user">
|
||||||
|
67
frontend/pages/debug.vue
Normal file
67
frontend/pages/debug.vue
Normal file
@ -0,0 +1,67 @@
|
|||||||
|
<template>
|
||||||
|
<div>
|
||||||
|
<h1 class="text-3xl mb-8">Debug</h1>
|
||||||
|
<div class="stats shadow mb-8">
|
||||||
|
<div class="stat">
|
||||||
|
<div class="stat-title">DB Ping Status</div>
|
||||||
|
<div class="stat-value">{{ data?.db_ping_status || "?" }}</div>
|
||||||
|
</div>
|
||||||
|
<div class="stat">
|
||||||
|
<div class="stat-title">Entries Count</div>
|
||||||
|
<div class="stat-value">{{ data?.entries.length || "?" }}</div>
|
||||||
|
<div class="stat-actions">
|
||||||
|
<button class="btn btn-sm" @click="addRandomEntry">Add entry</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="stat">
|
||||||
|
<div class="stat-title">Network status</div>
|
||||||
|
<div class="stat-value">{{ status }}</div>
|
||||||
|
<div class="stat-description">{{ error }}</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<h2 class="text-2xl mb-4">Entries</h2>
|
||||||
|
<table class="table">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th>Id</th>
|
||||||
|
<th>Title</th>
|
||||||
|
<th>Text</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
<tr v-for="entry in data?.entries" :key="entry.id">
|
||||||
|
<td>{{ entry.id }}</td>
|
||||||
|
<td>{{ entry.title }}</td>
|
||||||
|
<td>{{ entry.text }}</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup lang="ts">
|
||||||
|
type Entry = {
|
||||||
|
id: number;
|
||||||
|
title: string;
|
||||||
|
text: string;
|
||||||
|
};
|
||||||
|
type DebugResponse = {
|
||||||
|
db_ping_status: string;
|
||||||
|
entries: Entry[];
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
// TODO : handle a default backend URL by building a custom `$fetch` and `useFetch` functions with a `baseURL` option : https://nuxt.com/docs/guide/recipes/custom-usefetch#custom-fetch
|
||||||
|
|
||||||
|
const { data, refresh, error, status } = await useFetch<DebugResponse>('http://127.0.0.1:8080/debug');
|
||||||
|
|
||||||
|
async function addRandomEntry() {
|
||||||
|
await $fetch('http://127.0.0.1:8080/debug/add_random', {
|
||||||
|
method: 'POST',
|
||||||
|
});
|
||||||
|
refresh();
|
||||||
|
}
|
||||||
|
|
||||||
|
</script>
|
24
migration/Cargo.toml
Normal file
24
migration/Cargo.toml
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
[package]
|
||||||
|
name = "migration"
|
||||||
|
version = "0.1.0"
|
||||||
|
edition = "2021"
|
||||||
|
publish = false
|
||||||
|
|
||||||
|
[lib]
|
||||||
|
name = "migration"
|
||||||
|
path = "src/lib.rs"
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
async-std = { version = "1", features = ["attributes", "tokio1"] }
|
||||||
|
|
||||||
|
[dev-dependencies]
|
||||||
|
sea-orm-cli.workspace = true
|
||||||
|
|
||||||
|
[dependencies.sea-orm-migration]
|
||||||
|
version = "1.0.0"
|
||||||
|
features = [
|
||||||
|
# `ASYNC_RUNTIME` and `DATABASE_DRIVER` are required to run migration using the cli
|
||||||
|
# They must be the same as the features in the `sea-orm` dependency in the `app` crate
|
||||||
|
"sqlx-sqlite", # `DATABASE_DRIVER` feature
|
||||||
|
"runtime-tokio-rustls", # `ASYNC_RUNTIME` feature
|
||||||
|
]
|
41
migration/README.md
Normal file
41
migration/README.md
Normal file
@ -0,0 +1,41 @@
|
|||||||
|
# Running Migrator CLI
|
||||||
|
|
||||||
|
- Generate a new migration file
|
||||||
|
```sh
|
||||||
|
cargo run -- generate MIGRATION_NAME
|
||||||
|
```
|
||||||
|
- Apply all pending migrations
|
||||||
|
```sh
|
||||||
|
cargo run
|
||||||
|
```
|
||||||
|
```sh
|
||||||
|
cargo run -- up
|
||||||
|
```
|
||||||
|
- Apply first 10 pending migrations
|
||||||
|
```sh
|
||||||
|
cargo run -- up -n 10
|
||||||
|
```
|
||||||
|
- Rollback last applied migrations
|
||||||
|
```sh
|
||||||
|
cargo run -- down
|
||||||
|
```
|
||||||
|
- Rollback last 10 applied migrations
|
||||||
|
```sh
|
||||||
|
cargo run -- down -n 10
|
||||||
|
```
|
||||||
|
- Drop all tables from the database, then reapply all migrations
|
||||||
|
```sh
|
||||||
|
cargo run -- fresh
|
||||||
|
```
|
||||||
|
- Rollback all applied migrations, then reapply all migrations
|
||||||
|
```sh
|
||||||
|
cargo run -- refresh
|
||||||
|
```
|
||||||
|
- Rollback all applied migrations
|
||||||
|
```sh
|
||||||
|
cargo run -- reset
|
||||||
|
```
|
||||||
|
- Check the status of all migrations
|
||||||
|
```sh
|
||||||
|
cargo run -- status
|
||||||
|
```
|
12
migration/src/lib.rs
Normal file
12
migration/src/lib.rs
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
pub use sea_orm_migration::prelude::*;
|
||||||
|
|
||||||
|
mod m20220101_000001_create_debug_table;
|
||||||
|
|
||||||
|
pub struct Migrator;
|
||||||
|
|
||||||
|
#[async_trait::async_trait]
|
||||||
|
impl MigratorTrait for Migrator {
|
||||||
|
fn migrations() -> Vec<Box<dyn MigrationTrait>> {
|
||||||
|
vec![Box::new(m20220101_000001_create_debug_table::Migration)]
|
||||||
|
}
|
||||||
|
}
|
35
migration/src/m20220101_000001_create_debug_table.rs
Normal file
35
migration/src/m20220101_000001_create_debug_table.rs
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
use sea_orm_migration::{prelude::*, schema::*};
|
||||||
|
|
||||||
|
#[derive(DeriveMigrationName)]
|
||||||
|
pub struct Migration;
|
||||||
|
|
||||||
|
#[async_trait::async_trait]
|
||||||
|
impl MigrationTrait for Migration {
|
||||||
|
async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
|
||||||
|
manager
|
||||||
|
.create_table(
|
||||||
|
Table::create()
|
||||||
|
.table(Debug::Table)
|
||||||
|
.if_not_exists()
|
||||||
|
.col(pk_auto(Debug::Id))
|
||||||
|
.col(string(Debug::Title))
|
||||||
|
.col(string(Debug::Text))
|
||||||
|
.to_owned(),
|
||||||
|
)
|
||||||
|
.await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> {
|
||||||
|
manager
|
||||||
|
.drop_table(Table::drop().table(Debug::Table).to_owned())
|
||||||
|
.await
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(DeriveIden)]
|
||||||
|
enum Debug {
|
||||||
|
Table,
|
||||||
|
Id,
|
||||||
|
Title,
|
||||||
|
Text,
|
||||||
|
}
|
6
migration/src/main.rs
Normal file
6
migration/src/main.rs
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
use sea_orm_migration::prelude::*;
|
||||||
|
|
||||||
|
#[async_std::main]
|
||||||
|
async fn main() {
|
||||||
|
cli::run_cli(migration::Migrator).await;
|
||||||
|
}
|
Reference in New Issue
Block a user