diff --git a/PLAN.md b/PLAN.md index 4c7f7fd..9da2d93 100644 --- a/PLAN.md +++ b/PLAN.md @@ -738,7 +738,7 @@ Po ukończeniu zadania agent zmienia jego status w liście poniżej i dopisuje j - [x] T8 Zielony pełny build - [x] T9 Person: title/pwzNumber - [x] T10 PwzRegistrySource -- [ ] T11 Organization/Company rekordy + round-trip +- [x] T11 Organization/Company rekordy + round-trip - [ ] T12 GraphLoader: Organization/Company [NEO4J] - [ ] T13 GraphValidator: konflikt interesów [NEO4J] @@ -752,6 +752,7 @@ Po ukończeniu zadania agent zmienia jego status w liście poniżej i dopisuje j - 2026-07-08 — PLAN.md scalony z PLAN2.md (Person.title/pwzNumber, Organization/Company, kolejka T9–T13); dostosowano §11 pod Qwen-3.6-35B-A3B. - 2026-07-08 — T9 — Person: title/pwzNumber — dodano dwa pola do record Person, zaktualizowano wszyskie konstruktory (CanonicalWriter, Deduplicator, testy). 7 testow zielonych. - 2026-07-08 — T10 — PwzRegistrySource — PwzLookupClient (functional interface) + PwzRegistrySource(lookupPwz). 4 testy zielone. +- 2026-07-08 — T11 — Organization/Company entites + round-trip — Organization, Company, PersonOrganizationLink, OrganizationLink, PersonCompanyLink + LinkBasis enum. CanonicalDataset + CanonicalReader zaktualizowane. --- diff --git a/szpitale-graph/local-agent-progress.json b/szpitale-graph/local-agent-progress.json index bd6474b..b5b11ff 100644 --- a/szpitale-graph/local-agent-progress.json +++ b/szpitale-graph/local-agent-progress.json @@ -4,7 +4,7 @@ "description": "Stan wykonania kolejki zadań lokalnego agenta (PLAN2.md §11-13). Zrodlo prawdy przy konflikcie: git log.", "resumeHint": "Wczytaj ten plik, znajdz pierwszy task o statusie todo/in_progress. Jesli in_progress i drzewo git brudne -> git checkout -- . && git clean -fd, ustaw task na todo, zacznij od zera (PLAN2.md §13.1).", "createdAt": "2026-07-07", - "updatedAt": "2026-07-08T23:11:00Z", + "updatedAt": "2026-07-08T23:23:00Z", "tasks": [ { "id": "T1", @@ -100,10 +100,10 @@ "id": "T11", "title": "Organization/Company rekordy + round-trip", "tag": null, - "status": "todo", - "startedAt": null, - "finishedAt": null, - "note": "Nowe encje kanoniczne: Organization, Company, PersonOrganizationLink, OrganizationLink, PersonCompanyLink (PLAN.md 4.8, T11)." + "status": "done", + "startedAt": "2026-07-08T23:12:00Z", + "finishedAt": "2026-07-08T23:23:00Z", + "note": "Organization, Company, PersonOrganizationLink, OrganizationLink, PersonCompanyLink rekordy + LinkBasis enum. CanonicalDataset rozszerzony o 5 pól. Round-trip test zielony." }, { "id": "T12", diff --git a/szpitale-graph/src/main/java/com/developx/szpitale/ingest/CanonicalWriter.java b/szpitale-graph/src/main/java/com/developx/szpitale/ingest/CanonicalWriter.java index c379998..030c797 100644 --- a/szpitale-graph/src/main/java/com/developx/szpitale/ingest/CanonicalWriter.java +++ b/szpitale-graph/src/main/java/com/developx/szpitale/ingest/CanonicalWriter.java @@ -131,7 +131,8 @@ public class CanonicalWriter { CanonicalDataset dataset = new CanonicalDataset( "1.0", voivodeship, LocalDateTime.now(), - hospitals, people, affiliations, roles, List.of() + hospitals, people, affiliations, roles, List.of(), + List.of(), List.of(), List.of(), List.of(), List.of() ); Path outputFile = canonicalDir.resolve(voivodeship + ".json"); diff --git a/szpitale-graph/src/main/java/com/developx/szpitale/load/CanonicalReader.java b/szpitale-graph/src/main/java/com/developx/szpitale/load/CanonicalReader.java index 30cd86c..a7a02f3 100644 --- a/szpitale-graph/src/main/java/com/developx/szpitale/load/CanonicalReader.java +++ b/szpitale-graph/src/main/java/com/developx/szpitale/load/CanonicalReader.java @@ -4,6 +4,7 @@ import com.developx.szpitale.model.CanonicalDataset; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; +import java.io.File; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; @@ -50,4 +51,10 @@ public class CanonicalReader { public CanonicalDataset readSingle(Path inputDir, String voivodeship) throws IOException { return readAll(inputDir, voivodeship).stream().findFirst().orElse(null); } + + public static CanonicalDataset readDataset(File file) throws IOException { + ObjectMapper mapper = new ObjectMapper(); + mapper.registerModule(new JavaTimeModule()); + return mapper.readValue(file, CanonicalDataset.class); + } } diff --git a/szpitale-graph/src/main/java/com/developx/szpitale/model/CanonicalDataset.java b/szpitale-graph/src/main/java/com/developx/szpitale/model/CanonicalDataset.java index 1f99dcb..c341b46 100644 --- a/szpitale-graph/src/main/java/com/developx/szpitale/model/CanonicalDataset.java +++ b/szpitale-graph/src/main/java/com/developx/szpitale/model/CanonicalDataset.java @@ -13,6 +13,33 @@ public record CanonicalDataset( @JsonProperty("people") List people, @JsonProperty("affiliations") List affiliations, @JsonProperty("roles") List roles, - @JsonProperty("mandates") List mandates + @JsonProperty("mandates") List mandates, + @JsonProperty("organizations") List organizations, + @JsonProperty("companies") List companies, + @JsonProperty("personOrganizationLinks") List personOrganizationLinks, + @JsonProperty("organizationLinks") List organizationLinks, + @JsonProperty("personCompanyLinks") List personCompanyLinks ) { + public CanonicalDataset(String schemaVersion, String voivodeship, LocalDateTime generatedAt, + List hospitals, List people, + List affiliations, List roles, + List mandates, + List organizations, List companies, + List personOrganizationLinks, + List organizationLinks, + List personCompanyLinks) { + this.schemaVersion = schemaVersion; + this.voivodeship = voivodeship; + this.generatedAt = generatedAt; + this.hospitals = hospitals != null ? hospitals : List.of(); + this.people = people != null ? people : List.of(); + this.affiliations = affiliations != null ? affiliations : List.of(); + this.roles = roles != null ? roles : List.of(); + this.mandates = mandates != null ? mandates : List.of(); + this.organizations = organizations != null ? organizations : List.of(); + this.companies = companies != null ? companies : List.of(); + this.personOrganizationLinks = personOrganizationLinks != null ? personOrganizationLinks : List.of(); + this.organizationLinks = organizationLinks != null ? organizationLinks : List.of(); + this.personCompanyLinks = personCompanyLinks != null ? personCompanyLinks : List.of(); + } } diff --git a/szpitale-graph/src/main/java/com/developx/szpitale/model/Company.java b/szpitale-graph/src/main/java/com/developx/szpitale/model/Company.java new file mode 100644 index 0000000..bc8505b --- /dev/null +++ b/szpitale-graph/src/main/java/com/developx/szpitale/model/Company.java @@ -0,0 +1,15 @@ +package com.developx.szpitale.model; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import java.util.List; + +public record Company( + @JsonProperty("id") String id, + @JsonProperty("name") String name, + @JsonProperty("krs") String krs, + @JsonProperty("nip") String nip, + @JsonProperty("ceidgId") String ceidgId, + @JsonProperty("sourceUrls") List sourceUrls +) { +} diff --git a/szpitale-graph/src/main/java/com/developx/szpitale/model/Organization.java b/szpitale-graph/src/main/java/com/developx/szpitale/model/Organization.java new file mode 100644 index 0000000..27ccc06 --- /dev/null +++ b/szpitale-graph/src/main/java/com/developx/szpitale/model/Organization.java @@ -0,0 +1,14 @@ +package com.developx.szpitale.model; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import java.util.List; + +public record Organization( + @JsonProperty("id") String id, + @JsonProperty("name") String name, + @JsonProperty("krs") String krs, + @JsonProperty("nip") String nip, + @JsonProperty("sourceUrls") List sourceUrls +) { +} diff --git a/szpitale-graph/src/main/java/com/developx/szpitale/model/OrganizationLink.java b/szpitale-graph/src/main/java/com/developx/szpitale/model/OrganizationLink.java new file mode 100644 index 0000000..abfad69 --- /dev/null +++ b/szpitale-graph/src/main/java/com/developx/szpitale/model/OrganizationLink.java @@ -0,0 +1,15 @@ +package com.developx.szpitale.model; + +import com.developx.szpitale.model.enums.LinkBasis; +import com.fasterxml.jackson.annotation.JsonProperty; + +import java.util.List; + +public record OrganizationLink( + @JsonProperty("fromOrganizationId") String fromOrganizationId, + @JsonProperty("toOrganizationId") String toOrganizationId, + @JsonProperty("basis") LinkBasis basis, + @JsonProperty("note") String note, + @JsonProperty("sourceUrls") List sourceUrls +) { +} diff --git a/szpitale-graph/src/main/java/com/developx/szpitale/model/PersonCompanyLink.java b/szpitale-graph/src/main/java/com/developx/szpitale/model/PersonCompanyLink.java new file mode 100644 index 0000000..c1107d1 --- /dev/null +++ b/szpitale-graph/src/main/java/com/developx/szpitale/model/PersonCompanyLink.java @@ -0,0 +1,15 @@ +package com.developx.szpitale.model; + +import com.developx.szpitale.model.enums.LinkBasis; +import com.fasterxml.jackson.annotation.JsonProperty; + +import java.util.List; + +public record PersonCompanyLink( + @JsonProperty("personId") String personId, + @JsonProperty("companyId") String companyId, + @JsonProperty("roleLabel") String roleLabel, + @JsonProperty("basis") LinkBasis basis, + @JsonProperty("sourceUrls") List sourceUrls +) { +} diff --git a/szpitale-graph/src/main/java/com/developx/szpitale/model/PersonOrganizationLink.java b/szpitale-graph/src/main/java/com/developx/szpitale/model/PersonOrganizationLink.java new file mode 100644 index 0000000..9449870 --- /dev/null +++ b/szpitale-graph/src/main/java/com/developx/szpitale/model/PersonOrganizationLink.java @@ -0,0 +1,15 @@ +package com.developx.szpitale.model; + +import com.developx.szpitale.model.enums.LinkBasis; +import com.fasterxml.jackson.annotation.JsonProperty; + +import java.util.List; + +public record PersonOrganizationLink( + @JsonProperty("personId") String personId, + @JsonProperty("organizationId") String organizationId, + @JsonProperty("roleLabel") String roleLabel, + @JsonProperty("basis") LinkBasis basis, + @JsonProperty("sourceUrls") List sourceUrls +) { +} diff --git a/szpitale-graph/src/main/java/com/developx/szpitale/model/enums/LinkBasis.java b/szpitale-graph/src/main/java/com/developx/szpitale/model/enums/LinkBasis.java new file mode 100644 index 0000000..806483c --- /dev/null +++ b/szpitale-graph/src/main/java/com/developx/szpitale/model/enums/LinkBasis.java @@ -0,0 +1,7 @@ +package com.developx.szpitale.model.enums; + +public enum LinkBasis { + KRS, + NIP, + CEIDG +} diff --git a/szpitale-graph/src/test/java/com/developx/szpitale/ingest/OrganizationCompanyRoundTripTest.java b/szpitale-graph/src/test/java/com/developx/szpitale/ingest/OrganizationCompanyRoundTripTest.java new file mode 100644 index 0000000..1235f3c --- /dev/null +++ b/szpitale-graph/src/test/java/com/developx/szpitale/ingest/OrganizationCompanyRoundTripTest.java @@ -0,0 +1,133 @@ +package com.developx.szpitale.ingest; + +import com.developx.szpitale.load.CanonicalReader; +import com.developx.szpitale.model.*; +import com.developx.szpitale.model.enums.*; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; + +import java.nio.file.Files; +import java.nio.file.Path; +import java.time.LocalDateTime; +import java.util.List; + +import static org.junit.jupiter.api.Assertions.*; + +class OrganizationCompanyRoundTripTest { + + @TempDir + Path tempDir; + + @Test + void write_thenRead_preservesOrganizationsAndCompanies() throws Exception { + Organization organization = new Organization( + "org:fundacja-xyz", + "Fundacja XYZ", + "0000123456", + null, + List.of("https://ems.ms.gov.pl/fundacja-xyz") + ); + + Company company = new Company( + "company:abc-sp-zoo", + "ABC sp. z o.o.", + "0000654321", + "1234567890", + "CEIDG123", + List.of("https://wyszukiwarka-krs.ms.gov.pl/abc") + ); + + Person person = new Person( + "person:jan-kochanowicz", + "Jan Kochanowicz", + "prof. dr hab. Jan Kochanowicz", + List.of("prof.", "dr hab."), + List.of("https://uskwb.pl/"), + "prof. dr hab.", + null + ); + + PersonOrganizationLink pol = new PersonOrganizationLink( + "person:jan-kochanowicz", + "org:fundacja-xyz", + "Prezes Zarządu", + LinkBasis.KRS, + List.of("https://ems.ms.gov.pl/fundacja-xyz") + ); + + PersonCompanyLink pcl = new PersonCompanyLink( + "person:jan-kochanowicz", + "company:abc-sp-zoo", + "Wspólnik", + LinkBasis.KRS, + List.of("https://wyszukiwarka-krs.ms.gov.pl/abc") + ); + + OrganizationLink orgLink = new OrganizationLink( + "org:fundacja-xyz", + "org:inna-fundacja", + LinkBasis.NIP, + "wspolny adres", + List.of("https://ems.ms.gov.pl/fundacja-xyz") + ); + + CanonicalDataset dataset = new CanonicalDataset( + "1.0", + "podlaskie", + LocalDateTime.now(), + List.of(), + List.of(person), + List.of(), + List.of(), + List.of(), + List.of(organization), + List.of(company), + List.of(pol), + List.of(orgLink), + List.of(pcl) + ); + + Path outputFile = tempDir.resolve("test-canonical.json"); + ObjectMapper mapper = new ObjectMapper(); + mapper.registerModule(new JavaTimeModule()); + mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS); + mapper.writeValue(outputFile.toFile(), dataset); + + CanonicalDataset readResult = CanonicalReader.readDataset(outputFile.toFile()); + + assertNotNull(readResult.organizations()); + assertNotNull(readResult.companies()); + assertNotNull(readResult.personOrganizationLinks()); + assertNotNull(readResult.organizationLinks()); + assertNotNull(readResult.personCompanyLinks()); + + assertEquals(1, readResult.organizations().size()); + assertEquals("org:fundacja-xyz", readResult.organizations().get(0).id()); + assertEquals("Fundacja XYZ", readResult.organizations().get(0).name()); + assertEquals("0000123456", readResult.organizations().get(0).krs()); + + assertEquals(1, readResult.companies().size()); + assertEquals("company:abc-sp-zoo", readResult.companies().get(0).id()); + assertEquals("ABC sp. z o.o.", readResult.companies().get(0).name()); + assertEquals("1234567890", readResult.companies().get(0).nip()); + assertEquals("CEIDG123", readResult.companies().get(0).ceidgId()); + + assertEquals(1, readResult.personOrganizationLinks().size()); + assertEquals("person:jan-kochanowicz", readResult.personOrganizationLinks().get(0).personId()); + assertEquals("org:fundacja-xyz", readResult.personOrganizationLinks().get(0).organizationId()); + assertEquals(LinkBasis.KRS, readResult.personOrganizationLinks().get(0).basis()); + + assertEquals(1, readResult.organizationLinks().size()); + assertEquals("org:fundacja-xyz", readResult.organizationLinks().get(0).fromOrganizationId()); + assertEquals("org:inna-fundacja", readResult.organizationLinks().get(0).toOrganizationId()); + assertEquals(LinkBasis.NIP, readResult.organizationLinks().get(0).basis()); + + assertEquals(1, readResult.personCompanyLinks().size()); + assertEquals("person:jan-kochanowicz", readResult.personCompanyLinks().get(0).personId()); + assertEquals("company:abc-sp-zoo", readResult.personCompanyLinks().get(0).companyId()); + assertEquals(LinkBasis.KRS, readResult.personCompanyLinks().get(0).basis()); + } +} diff --git a/szpitale-graph/src/test/java/com/developx/szpitale/load/CanonicalRoundTripTest.java b/szpitale-graph/src/test/java/com/developx/szpitale/load/CanonicalRoundTripTest.java index 743e626..351ed9e 100644 --- a/szpitale-graph/src/test/java/com/developx/szpitale/load/CanonicalRoundTripTest.java +++ b/szpitale-graph/src/test/java/com/developx/szpitale/load/CanonicalRoundTripTest.java @@ -72,7 +72,8 @@ class CanonicalRoundTripTest { List.of(person), List.of(affiliation), List.of(role), - List.of() + List.of(), + List.of(), List.of(), List.of(), List.of(), List.of() ); Path canonicalDir = tempDir.resolve("canonical"); diff --git a/szpitale-graph/target/classes/com/developx/szpitale/ingest/CanonicalWriter.class b/szpitale-graph/target/classes/com/developx/szpitale/ingest/CanonicalWriter.class index 11be567..630e4eb 100644 Binary files a/szpitale-graph/target/classes/com/developx/szpitale/ingest/CanonicalWriter.class and b/szpitale-graph/target/classes/com/developx/szpitale/ingest/CanonicalWriter.class differ diff --git a/szpitale-graph/target/classes/com/developx/szpitale/load/CanonicalReader.class b/szpitale-graph/target/classes/com/developx/szpitale/load/CanonicalReader.class index 172728f..7eb486a 100644 Binary files a/szpitale-graph/target/classes/com/developx/szpitale/load/CanonicalReader.class and b/szpitale-graph/target/classes/com/developx/szpitale/load/CanonicalReader.class differ diff --git a/szpitale-graph/target/classes/com/developx/szpitale/model/CanonicalDataset.class b/szpitale-graph/target/classes/com/developx/szpitale/model/CanonicalDataset.class index 1b72cfb..b93f4f6 100644 Binary files a/szpitale-graph/target/classes/com/developx/szpitale/model/CanonicalDataset.class and b/szpitale-graph/target/classes/com/developx/szpitale/model/CanonicalDataset.class differ diff --git a/szpitale-graph/target/classes/com/developx/szpitale/model/Company.class b/szpitale-graph/target/classes/com/developx/szpitale/model/Company.class new file mode 100644 index 0000000..b696f89 Binary files /dev/null and b/szpitale-graph/target/classes/com/developx/szpitale/model/Company.class differ diff --git a/szpitale-graph/target/classes/com/developx/szpitale/model/Organization.class b/szpitale-graph/target/classes/com/developx/szpitale/model/Organization.class new file mode 100644 index 0000000..b3afb54 Binary files /dev/null and b/szpitale-graph/target/classes/com/developx/szpitale/model/Organization.class differ diff --git a/szpitale-graph/target/classes/com/developx/szpitale/model/OrganizationLink.class b/szpitale-graph/target/classes/com/developx/szpitale/model/OrganizationLink.class new file mode 100644 index 0000000..ae3ca47 Binary files /dev/null and b/szpitale-graph/target/classes/com/developx/szpitale/model/OrganizationLink.class differ diff --git a/szpitale-graph/target/classes/com/developx/szpitale/model/PersonCompanyLink.class b/szpitale-graph/target/classes/com/developx/szpitale/model/PersonCompanyLink.class new file mode 100644 index 0000000..2641183 Binary files /dev/null and b/szpitale-graph/target/classes/com/developx/szpitale/model/PersonCompanyLink.class differ diff --git a/szpitale-graph/target/classes/com/developx/szpitale/model/PersonOrganizationLink.class b/szpitale-graph/target/classes/com/developx/szpitale/model/PersonOrganizationLink.class new file mode 100644 index 0000000..f9a9078 Binary files /dev/null and b/szpitale-graph/target/classes/com/developx/szpitale/model/PersonOrganizationLink.class differ diff --git a/szpitale-graph/target/classes/com/developx/szpitale/model/enums/LinkBasis.class b/szpitale-graph/target/classes/com/developx/szpitale/model/enums/LinkBasis.class new file mode 100644 index 0000000..aed3cab Binary files /dev/null and b/szpitale-graph/target/classes/com/developx/szpitale/model/enums/LinkBasis.class differ diff --git a/szpitale-graph/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/szpitale-graph/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index 2859c4d..4ae68ab 100644 --- a/szpitale-graph/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/szpitale-graph/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -1,10 +1,13 @@ com/developx/szpitale/ingest/IngestResults.class com/developx/szpitale/load/CanonicalReader.class com/developx/szpitale/ingest/source/VoivodeshipSource.class +com/developx/szpitale/model/PersonOrganizationLink.class com/developx/szpitale/model/enums/AffiliationType.class com/developx/szpitale/ingest/source/MarkdownRegistrySource.class com/developx/szpitale/SzpitaleGraphApplication.class +com/developx/szpitale/model/Company.class com/developx/szpitale/load/GraphValidator.class +com/developx/szpitale/model/Organization.class com/developx/szpitale/ingest/IngestCommand.class com/developx/szpitale/ingest/normalize/PartyNormalizer.class com/developx/szpitale/load/LoadCommand.class @@ -13,6 +16,7 @@ com/developx/szpitale/ingest/normalize/Deduplicator.class com/developx/szpitale/load/GraphSchema.class com/developx/szpitale/model/enums/OrganType.class com/developx/szpitale/model/RawHospitalRecord$RawMandate.class +com/developx/szpitale/model/OrganizationLink.class com/developx/szpitale/model/enums/ConfidenceLevel.class com/developx/szpitale/ingest/source/PwzRegistrySource.class com/developx/szpitale/ingest/normalize/NameNormalizer.class @@ -21,7 +25,9 @@ com/developx/szpitale/model/enums/SupervisoryBodyType.class com/developx/szpitale/load/GraphLoader.class com/developx/szpitale/model/RawHospitalRecord.class com/developx/szpitale/ingest/CanonicalWriter.class +com/developx/szpitale/model/PersonCompanyLink.class com/developx/szpitale/load/GraphLoader$LoadStats.class +com/developx/szpitale/model/enums/LinkBasis.class com/developx/szpitale/model/enums/RoleType.class com/developx/szpitale/ingest/source/PwzLookupClient.class com/developx/szpitale/model/enums/LegalForm.class diff --git a/szpitale-graph/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/szpitale-graph/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index c941fe7..fff7327 100644 --- a/szpitale-graph/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/szpitale-graph/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -16,14 +16,20 @@ /home/kruszewskia/Workspace/Private/Szpitale-graph/szpitale-graph/src/main/java/com/developx/szpitale/load/LoadCommand.java /home/kruszewskia/Workspace/Private/Szpitale-graph/szpitale-graph/src/main/java/com/developx/szpitale/model/Affiliation.java /home/kruszewskia/Workspace/Private/Szpitale-graph/szpitale-graph/src/main/java/com/developx/szpitale/model/CanonicalDataset.java +/home/kruszewskia/Workspace/Private/Szpitale-graph/szpitale-graph/src/main/java/com/developx/szpitale/model/Company.java /home/kruszewskia/Workspace/Private/Szpitale-graph/szpitale-graph/src/main/java/com/developx/szpitale/model/Hospital.java /home/kruszewskia/Workspace/Private/Szpitale-graph/szpitale-graph/src/main/java/com/developx/szpitale/model/Mandate.java +/home/kruszewskia/Workspace/Private/Szpitale-graph/szpitale-graph/src/main/java/com/developx/szpitale/model/Organization.java +/home/kruszewskia/Workspace/Private/Szpitale-graph/szpitale-graph/src/main/java/com/developx/szpitale/model/OrganizationLink.java /home/kruszewskia/Workspace/Private/Szpitale-graph/szpitale-graph/src/main/java/com/developx/szpitale/model/Person.java +/home/kruszewskia/Workspace/Private/Szpitale-graph/szpitale-graph/src/main/java/com/developx/szpitale/model/PersonCompanyLink.java +/home/kruszewskia/Workspace/Private/Szpitale-graph/szpitale-graph/src/main/java/com/developx/szpitale/model/PersonOrganizationLink.java /home/kruszewskia/Workspace/Private/Szpitale-graph/szpitale-graph/src/main/java/com/developx/szpitale/model/RawHospitalRecord.java /home/kruszewskia/Workspace/Private/Szpitale-graph/szpitale-graph/src/main/java/com/developx/szpitale/model/Role.java /home/kruszewskia/Workspace/Private/Szpitale-graph/szpitale-graph/src/main/java/com/developx/szpitale/model/enums/AffiliationType.java /home/kruszewskia/Workspace/Private/Szpitale-graph/szpitale-graph/src/main/java/com/developx/szpitale/model/enums/ConfidenceLevel.java /home/kruszewskia/Workspace/Private/Szpitale-graph/szpitale-graph/src/main/java/com/developx/szpitale/model/enums/LegalForm.java +/home/kruszewskia/Workspace/Private/Szpitale-graph/szpitale-graph/src/main/java/com/developx/szpitale/model/enums/LinkBasis.java /home/kruszewskia/Workspace/Private/Szpitale-graph/szpitale-graph/src/main/java/com/developx/szpitale/model/enums/MandateType.java /home/kruszewskia/Workspace/Private/Szpitale-graph/szpitale-graph/src/main/java/com/developx/szpitale/model/enums/OrganType.java /home/kruszewskia/Workspace/Private/Szpitale-graph/szpitale-graph/src/main/java/com/developx/szpitale/model/enums/RoleStatus.java diff --git a/szpitale-graph/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/szpitale-graph/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst index ab67bea..3f7a7af 100644 --- a/szpitale-graph/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst +++ b/szpitale-graph/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst @@ -1,7 +1,8 @@ +com/developx/szpitale/ingest/OrganizationCompanyRoundTripTest.class +com/developx/szpitale/ingest/source/PwzRegistrySourceTest.class com/developx/szpitale/ingest/normalize/NameNormalizerTest.class com/developx/szpitale/ingest/normalize/PartyNormalizerTest.class com/developx/szpitale/model/PersonTest.class -com/developx/szpitale/ingest/source/PwzRegistrySourceTest.class com/developx/szpitale/ingest/source/MarkdownRegistrySourceTest.class com/developx/szpitale/ingest/normalize/DeduplicatorTest.class com/developx/szpitale/load/CanonicalRoundTripTest.class diff --git a/szpitale-graph/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/szpitale-graph/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst index 2285ad9..84c3586 100644 --- a/szpitale-graph/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst +++ b/szpitale-graph/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst @@ -1,3 +1,4 @@ +/home/kruszewskia/Workspace/Private/Szpitale-graph/szpitale-graph/src/test/java/com/developx/szpitale/ingest/OrganizationCompanyRoundTripTest.java /home/kruszewskia/Workspace/Private/Szpitale-graph/szpitale-graph/src/test/java/com/developx/szpitale/ingest/normalize/DeduplicatorTest.java /home/kruszewskia/Workspace/Private/Szpitale-graph/szpitale-graph/src/test/java/com/developx/szpitale/ingest/normalize/NameNormalizerTest.java /home/kruszewskia/Workspace/Private/Szpitale-graph/szpitale-graph/src/test/java/com/developx/szpitale/ingest/normalize/PartyNormalizerTest.java diff --git a/szpitale-graph/target/surefire-reports/TEST-com.developx.szpitale.ingest.OrganizationCompanyRoundTripTest.xml b/szpitale-graph/target/surefire-reports/TEST-com.developx.szpitale.ingest.OrganizationCompanyRoundTripTest.xml new file mode 100644 index 0000000..26a2221 --- /dev/null +++ b/szpitale-graph/target/surefire-reports/TEST-com.developx.szpitale.ingest.OrganizationCompanyRoundTripTest.xml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/szpitale-graph/target/surefire-reports/TEST-com.developx.szpitale.ingest.normalize.DeduplicatorTest.xml b/szpitale-graph/target/surefire-reports/TEST-com.developx.szpitale.ingest.normalize.DeduplicatorTest.xml index 48de5df..6643ebf 100644 --- a/szpitale-graph/target/surefire-reports/TEST-com.developx.szpitale.ingest.normalize.DeduplicatorTest.xml +++ b/szpitale-graph/target/surefire-reports/TEST-com.developx.szpitale.ingest.normalize.DeduplicatorTest.xml @@ -13,7 +13,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -55,6 +55,6 @@ - + \ No newline at end of file diff --git a/szpitale-graph/target/surefire-reports/TEST-com.developx.szpitale.ingest.normalize.NameNormalizerTest.xml b/szpitale-graph/target/surefire-reports/TEST-com.developx.szpitale.ingest.normalize.NameNormalizerTest.xml index 9a5b657..36085ae 100644 --- a/szpitale-graph/target/surefire-reports/TEST-com.developx.szpitale.ingest.normalize.NameNormalizerTest.xml +++ b/szpitale-graph/target/surefire-reports/TEST-com.developx.szpitale.ingest.normalize.NameNormalizerTest.xml @@ -1,5 +1,5 @@ - + @@ -13,7 +13,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -67,17 +67,17 @@ - + - - + + - - + + \ No newline at end of file diff --git a/szpitale-graph/target/surefire-reports/TEST-com.developx.szpitale.ingest.normalize.PartyNormalizerTest.xml b/szpitale-graph/target/surefire-reports/TEST-com.developx.szpitale.ingest.normalize.PartyNormalizerTest.xml index c46dd8a..f85abfa 100644 --- a/szpitale-graph/target/surefire-reports/TEST-com.developx.szpitale.ingest.normalize.PartyNormalizerTest.xml +++ b/szpitale-graph/target/surefire-reports/TEST-com.developx.szpitale.ingest.normalize.PartyNormalizerTest.xml @@ -1,5 +1,5 @@ - + @@ -13,7 +13,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -55,19 +55,19 @@ - - + + - - + + - + - - - - - - + + + + + + \ No newline at end of file diff --git a/szpitale-graph/target/surefire-reports/TEST-com.developx.szpitale.ingest.source.MarkdownRegistrySourceTest.xml b/szpitale-graph/target/surefire-reports/TEST-com.developx.szpitale.ingest.source.MarkdownRegistrySourceTest.xml index f1cef28..51667fa 100644 --- a/szpitale-graph/target/surefire-reports/TEST-com.developx.szpitale.ingest.source.MarkdownRegistrySourceTest.xml +++ b/szpitale-graph/target/surefire-reports/TEST-com.developx.szpitale.ingest.source.MarkdownRegistrySourceTest.xml @@ -1,5 +1,5 @@ - + @@ -13,7 +13,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -55,8 +55,8 @@ - - + diff --git a/szpitale-graph/target/surefire-reports/TEST-com.developx.szpitale.ingest.source.PwzRegistrySourceTest.xml b/szpitale-graph/target/surefire-reports/TEST-com.developx.szpitale.ingest.source.PwzRegistrySourceTest.xml index 41cf33e..02b108a 100644 --- a/szpitale-graph/target/surefire-reports/TEST-com.developx.szpitale.ingest.source.PwzRegistrySourceTest.xml +++ b/szpitale-graph/target/surefire-reports/TEST-com.developx.szpitale.ingest.source.PwzRegistrySourceTest.xml @@ -1,5 +1,5 @@ - + @@ -13,7 +13,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -56,7 +56,7 @@ - - - + + + \ No newline at end of file diff --git a/szpitale-graph/target/surefire-reports/TEST-com.developx.szpitale.load.CanonicalRoundTripTest.xml b/szpitale-graph/target/surefire-reports/TEST-com.developx.szpitale.load.CanonicalRoundTripTest.xml index 68e0cca..d8cacc9 100644 --- a/szpitale-graph/target/surefire-reports/TEST-com.developx.szpitale.load.CanonicalRoundTripTest.xml +++ b/szpitale-graph/target/surefire-reports/TEST-com.developx.szpitale.load.CanonicalRoundTripTest.xml @@ -1,5 +1,5 @@ - + @@ -13,7 +13,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -55,5 +55,5 @@ - + \ No newline at end of file diff --git a/szpitale-graph/target/surefire-reports/TEST-com.developx.szpitale.model.PersonTest.xml b/szpitale-graph/target/surefire-reports/TEST-com.developx.szpitale.model.PersonTest.xml index d32f6fb..67862e4 100644 --- a/szpitale-graph/target/surefire-reports/TEST-com.developx.szpitale.model.PersonTest.xml +++ b/szpitale-graph/target/surefire-reports/TEST-com.developx.szpitale.model.PersonTest.xml @@ -13,7 +13,7 @@ - + @@ -28,7 +28,7 @@ - + diff --git a/szpitale-graph/target/surefire-reports/com.developx.szpitale.ingest.OrganizationCompanyRoundTripTest.txt b/szpitale-graph/target/surefire-reports/com.developx.szpitale.ingest.OrganizationCompanyRoundTripTest.txt new file mode 100644 index 0000000..c3bdf82 --- /dev/null +++ b/szpitale-graph/target/surefire-reports/com.developx.szpitale.ingest.OrganizationCompanyRoundTripTest.txt @@ -0,0 +1,4 @@ +------------------------------------------------------------------------------- +Test set: com.developx.szpitale.ingest.OrganizationCompanyRoundTripTest +------------------------------------------------------------------------------- +Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.168 s -- in com.developx.szpitale.ingest.OrganizationCompanyRoundTripTest diff --git a/szpitale-graph/target/surefire-reports/com.developx.szpitale.ingest.normalize.NameNormalizerTest.txt b/szpitale-graph/target/surefire-reports/com.developx.szpitale.ingest.normalize.NameNormalizerTest.txt index dd377e2..da61633 100644 --- a/szpitale-graph/target/surefire-reports/com.developx.szpitale.ingest.normalize.NameNormalizerTest.txt +++ b/szpitale-graph/target/surefire-reports/com.developx.szpitale.ingest.normalize.NameNormalizerTest.txt @@ -1,4 +1,4 @@ ------------------------------------------------------------------------------- Test set: com.developx.szpitale.ingest.normalize.NameNormalizerTest ------------------------------------------------------------------------------- -Tests run: 25, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.068 s -- in com.developx.szpitale.ingest.normalize.NameNormalizerTest +Tests run: 25, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.064 s -- in com.developx.szpitale.ingest.normalize.NameNormalizerTest diff --git a/szpitale-graph/target/surefire-reports/com.developx.szpitale.ingest.normalize.PartyNormalizerTest.txt b/szpitale-graph/target/surefire-reports/com.developx.szpitale.ingest.normalize.PartyNormalizerTest.txt index e00157c..83f9baa 100644 --- a/szpitale-graph/target/surefire-reports/com.developx.szpitale.ingest.normalize.PartyNormalizerTest.txt +++ b/szpitale-graph/target/surefire-reports/com.developx.szpitale.ingest.normalize.PartyNormalizerTest.txt @@ -1,4 +1,4 @@ ------------------------------------------------------------------------------- Test set: com.developx.szpitale.ingest.normalize.PartyNormalizerTest ------------------------------------------------------------------------------- -Tests run: 15, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.021 s -- in com.developx.szpitale.ingest.normalize.PartyNormalizerTest +Tests run: 15, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.018 s -- in com.developx.szpitale.ingest.normalize.PartyNormalizerTest diff --git a/szpitale-graph/target/surefire-reports/com.developx.szpitale.ingest.source.MarkdownRegistrySourceTest.txt b/szpitale-graph/target/surefire-reports/com.developx.szpitale.ingest.source.MarkdownRegistrySourceTest.txt index d574688..6276e3a 100644 --- a/szpitale-graph/target/surefire-reports/com.developx.szpitale.ingest.source.MarkdownRegistrySourceTest.txt +++ b/szpitale-graph/target/surefire-reports/com.developx.szpitale.ingest.source.MarkdownRegistrySourceTest.txt @@ -1,4 +1,4 @@ ------------------------------------------------------------------------------- Test set: com.developx.szpitale.ingest.source.MarkdownRegistrySourceTest ------------------------------------------------------------------------------- -Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.097 s -- in com.developx.szpitale.ingest.source.MarkdownRegistrySourceTest +Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.090 s -- in com.developx.szpitale.ingest.source.MarkdownRegistrySourceTest diff --git a/szpitale-graph/target/surefire-reports/com.developx.szpitale.ingest.source.PwzRegistrySourceTest.txt b/szpitale-graph/target/surefire-reports/com.developx.szpitale.ingest.source.PwzRegistrySourceTest.txt index 85727a8..7758a89 100644 --- a/szpitale-graph/target/surefire-reports/com.developx.szpitale.ingest.source.PwzRegistrySourceTest.txt +++ b/szpitale-graph/target/surefire-reports/com.developx.szpitale.ingest.source.PwzRegistrySourceTest.txt @@ -1,4 +1,4 @@ ------------------------------------------------------------------------------- Test set: com.developx.szpitale.ingest.source.PwzRegistrySourceTest ------------------------------------------------------------------------------- -Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.007 s -- in com.developx.szpitale.ingest.source.PwzRegistrySourceTest +Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.005 s -- in com.developx.szpitale.ingest.source.PwzRegistrySourceTest diff --git a/szpitale-graph/target/surefire-reports/com.developx.szpitale.load.CanonicalRoundTripTest.txt b/szpitale-graph/target/surefire-reports/com.developx.szpitale.load.CanonicalRoundTripTest.txt index 6187d0f..bb4f35c 100644 --- a/szpitale-graph/target/surefire-reports/com.developx.szpitale.load.CanonicalRoundTripTest.txt +++ b/szpitale-graph/target/surefire-reports/com.developx.szpitale.load.CanonicalRoundTripTest.txt @@ -1,4 +1,4 @@ ------------------------------------------------------------------------------- Test set: com.developx.szpitale.load.CanonicalRoundTripTest ------------------------------------------------------------------------------- -Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.193 s -- in com.developx.szpitale.load.CanonicalRoundTripTest +Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.024 s -- in com.developx.szpitale.load.CanonicalRoundTripTest diff --git a/szpitale-graph/target/szpitale-graph-1.0.0-SNAPSHOT.jar b/szpitale-graph/target/szpitale-graph-1.0.0-SNAPSHOT.jar index 65844ab..063f658 100644 Binary files a/szpitale-graph/target/szpitale-graph-1.0.0-SNAPSHOT.jar and b/szpitale-graph/target/szpitale-graph-1.0.0-SNAPSHOT.jar differ diff --git a/szpitale-graph/target/szpitale-graph-1.0.0-SNAPSHOT.jar.original b/szpitale-graph/target/szpitale-graph-1.0.0-SNAPSHOT.jar.original index 0c62f2e..e601877 100644 Binary files a/szpitale-graph/target/szpitale-graph-1.0.0-SNAPSHOT.jar.original and b/szpitale-graph/target/szpitale-graph-1.0.0-SNAPSHOT.jar.original differ diff --git a/szpitale-graph/target/test-classes/com/developx/szpitale/ingest/OrganizationCompanyRoundTripTest.class b/szpitale-graph/target/test-classes/com/developx/szpitale/ingest/OrganizationCompanyRoundTripTest.class new file mode 100644 index 0000000..ae3b7c0 Binary files /dev/null and b/szpitale-graph/target/test-classes/com/developx/szpitale/ingest/OrganizationCompanyRoundTripTest.class differ diff --git a/szpitale-graph/target/test-classes/com/developx/szpitale/load/CanonicalRoundTripTest.class b/szpitale-graph/target/test-classes/com/developx/szpitale/load/CanonicalRoundTripTest.class index 3c1d517..1cbff17 100644 Binary files a/szpitale-graph/target/test-classes/com/developx/szpitale/load/CanonicalRoundTripTest.class and b/szpitale-graph/target/test-classes/com/developx/szpitale/load/CanonicalRoundTripTest.class differ