Skip to content

Commit

Permalink
fix unit tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Volubyl committed Aug 16, 2022
1 parent a72a652 commit 3eac006
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 7 deletions.
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
11 changes: 5 additions & 6 deletions tools/initdata.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,18 @@
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.catalogs.commands import CreateCatalog
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.domain.catalogs.repositories import CatalogRepository
from server.seedwork.application.messages import MessageBus

load_dotenv()
Expand Down Expand Up @@ -155,6 +155,7 @@ async def handle_organizations(item: dict) -> None:
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)
Expand All @@ -165,9 +166,7 @@ async def handle_catalogs(item: dict) -> None:

if existing_organization is not None:

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

Expand Down Expand Up @@ -203,12 +202,12 @@ async def main(path: pathlib.Path, reset: bool = False, no_input: bool = False)
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()
parser.add_argument("path", type=pathlib.Path)
Expand Down

0 comments on commit 3eac006

Please sign in to comment.