Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat add organization and catalog fixtures in init data #374

Merged
merged 4 commits into from
Aug 17, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified docs/db.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions ops/ansible/environments/staging/assets/initdata.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,3 +97,6 @@ datasets:
last_updated_at: null
url: "https://www.data.gouv.fr/fr/datasets/catalogue-des-enquetes-realisees-par-la-dares-2012-572205/"
tag_ids: []
# créer une organization
# créer un cataloge // Pour les relier utiliser un siret qui existe
# Lier un dataset au catalogue
13 changes: 12 additions & 1 deletion tests/tools/test_initdata.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ async def test_initdata_empty(tmp_path: Path) -> None:
users: []
tags: []
datasets: []
organizations: []
catalogs: []

"""
)
await initdata.main(path)
Expand Down Expand Up @@ -53,6 +56,9 @@ async def test_initdata_env_password_invalid(
email: [email protected]
password: __env__
datasets: []
organizations: []
catalogs: []

"""
)

Expand All @@ -78,6 +84,9 @@ async def test_initdata_env_password(
password: __env__
tags: []
datasets: []
organizations: []
catalogs: []

"""
)

Expand Down Expand Up @@ -115,7 +124,9 @@ async def test_repo_initdata(
num_users = 2
num_tags = 7
num_datasets = 4
num_entities = num_users + num_tags + num_datasets
num_organization = 1
num_catalog = 1
num_entities = num_users + num_tags + num_datasets + num_catalog + num_organization

await initdata.main(path, no_input=True)
captured = capsys.readouterr()
Expand Down
56 changes: 56 additions & 0 deletions tools/initdata.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,17 @@
from pydantic import BaseModel, ValidationError, parse_raw_as

from server.application.auth.commands import CreatePasswordUser
from server.application.catalogs.commands import CreateCatalog
from server.application.datasets.commands import CreateDataset, UpdateDataset
from server.application.organizations.commands import CreateOrganization
from server.application.tags.commands import CreateTag
from server.config.di import bootstrap, resolve
from server.domain.auth.entities import UserRole
from server.domain.auth.repositories import PasswordUserRepository
from server.domain.catalogs.repositories import CatalogRepository
from server.domain.datasets.entities import Dataset
from server.domain.datasets.repositories import DatasetRepository
from server.domain.organizations.repositories import OrganizationRepository
from server.domain.tags.repositories import TagRepository
from server.seedwork.application.messages import MessageBus

Expand Down Expand Up @@ -130,6 +134,48 @@ def _get_dataset_attr(dataset: Dataset, attr: str) -> Any:
print(f"{success('created')}: {create_command!r}")


async def handle_organizations(item: dict) -> None:
bus = resolve(MessageBus)
repository = resolve(OrganizationRepository)

siret = item["params"]["siret"]

existing_organization = await repository.get_by_siret(siret)

if existing_organization is not None:

organization_repr = (
f"Organization(siret={siret!r}, name={item['params']['name']!r}, ...)"
)
print(f"{info('ok')}: {organization_repr}")
return

create_command = CreateOrganization(**item["params"])

await bus.execute(create_command)
print(f"{success('created')}: {create_command!r}")


async def handle_catalogs(item: dict) -> None:
bus = resolve(MessageBus)
repository = resolve(CatalogRepository)

siret = item["params"]["organization_siret"]

existing_organization = await repository.get_by_siret(siret)

if existing_organization is not None:

organization_repr = f"Catalog(siret={siret!r}, ...)"
print(f"{info('ok')}: {organization_repr}")
return

create_command = CreateCatalog(**item["params"])

await bus.execute(create_command)
print(f"{success('created')}: {create_command!r}")


async def main(path: pathlib.Path, reset: bool = False, no_input: bool = False) -> None:
with path.open() as f:
spec = yaml.safe_load(f)
Expand All @@ -151,6 +197,16 @@ async def main(path: pathlib.Path, reset: bool = False, no_input: bool = False)
for item in spec["datasets"]:
await handle_dataset(item, reset=reset)

print("\n", ruler("Organizations"))

for item in spec["organizations"]:
await handle_organizations(item)

print("\n", ruler("Catalogs"))

for item in spec["catalogs"]:
await handle_catalogs(item)


if __name__ == "__main__":
parser = argparse.ArgumentParser()
Expand Down
10 changes: 9 additions & 1 deletion tools/initdata.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ datasets:
description: |
Par région, les ressources ci-dessous recensent les restaurants, brasseries et cafétérias dans le réseau des CROUS.
service: Direction des données du CROUS
geographical_coverage: Monde # Fake, for E2E testing purposes
geographical_coverage: Monde # Fake, for E2E testing purposes
formats:
- file_tabular
technical_source: Système d'information central du CROUS
Expand Down Expand Up @@ -120,3 +120,11 @@ datasets:
url: "https://www.data.gouv.fr/fr/datasets/catalogue-des-enquetes-realisees-par-la-dares-2012-572205/"
license: Licence Ouverte
tag_ids: []
organizations:
- params:
name: "Ministère de la Culture"
siret: "44229377500031" # Siret of https://www.societe.com/societe/fake-442293775.html

catalogs:
- params:
organization_siret: "44229377500031" # See "Ministère de la Culture"