|
23 | 23 | import life.qbic.projectmanagement.application.OrganisationLookupService;
|
24 | 24 | import life.qbic.projectmanagement.application.ProjectInformationService;
|
25 | 25 | import life.qbic.projectmanagement.application.ontology.SpeciesLookupService;
|
| 26 | +import life.qbic.projectmanagement.application.ontology.TerminologyService; |
26 | 27 | import life.qbic.projectmanagement.application.sample.SampleIdCodeEntry;
|
27 | 28 | import life.qbic.projectmanagement.application.sample.SampleInformationService;
|
28 | 29 | import life.qbic.projectmanagement.domain.model.OntologyTerm;
|
@@ -65,28 +66,29 @@ public class MeasurementService {
|
65 | 66 | private final MeasurementDomainService measurementDomainService;
|
66 | 67 | private final MeasurementLookupService measurementLookupService;
|
67 | 68 | private final SampleInformationService sampleInformationService;
|
68 |
| - private final SpeciesLookupService speciesLookupService; |
69 | 69 | private final OrganisationLookupService organisationLookupService;
|
70 | 70 | private final ProjectInformationService projectInformationService;
|
71 | 71 | private final MeasurementRepository measurementRepository;
|
| 72 | + private final TerminologyService terminologyService; |
72 | 73 |
|
73 | 74 | @Autowired
|
74 | 75 | public MeasurementService(MeasurementDomainService measurementDomainService,
|
75 | 76 | SampleInformationService sampleInformationService,
|
76 |
| - SpeciesLookupService speciesLookupService, |
77 | 77 | OrganisationLookupService organisationLookupService,
|
78 | 78 | MeasurementLookupService measurementLookupService,
|
79 | 79 | ProjectInformationService projectInformationService,
|
80 | 80 | MeasurementRepository measurementRepository,
|
| 81 | + TerminologyService terminologyService, |
81 | 82 | ApplicationContext context) {
|
82 | 83 | this.measurementDomainService = Objects.requireNonNull(measurementDomainService);
|
83 | 84 | this.sampleInformationService = Objects.requireNonNull(sampleInformationService);
|
84 |
| - this.speciesLookupService = Objects.requireNonNull(speciesLookupService); |
85 | 85 | this.organisationLookupService = Objects.requireNonNull(organisationLookupService);
|
86 | 86 | this.measurementLookupService = Objects.requireNonNull(measurementLookupService);
|
87 | 87 | this.projectInformationService = Objects.requireNonNull(projectInformationService);
|
88 | 88 | this.measurementRepository = Objects.requireNonNull(measurementRepository);
|
89 | 89 | this.context = Objects.requireNonNull(context);
|
| 90 | + this.terminologyService = Objects.requireNonNull(terminologyService); |
| 91 | + |
90 | 92 | }
|
91 | 93 |
|
92 | 94 | /**
|
@@ -778,7 +780,7 @@ private boolean allMeasurementCodesExist(List<String> measurementCode) {
|
778 | 780 | }
|
779 | 781 |
|
780 | 782 | private Optional<OntologyTerm> resolveOntologyCURI(String ontologyCURI) {
|
781 |
| - return speciesLookupService.findByCURI(ontologyCURI).map(OntologyTerm::from); |
| 783 | + return terminologyService.findByCurie(ontologyCURI); |
782 | 784 | }
|
783 | 785 |
|
784 | 786 | private Optional<SampleIdCodeEntry> queryIdCodePair(SampleCode sampleCode) {
|
|
0 commit comments