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

add tracker compatibility for version 41 #63

Merged
merged 9 commits into from
Jan 14, 2025
Next Next commit
fixed period range for datavalues endpoint
  • Loading branch information
eperedo committed Oct 25, 2024
commit eee8ff92c496cebd3a8e7785da950b57cfd94717
22 changes: 8 additions & 14 deletions src/domain/usecases/RunPractitionersValidationUseCase.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,12 @@ import { IssueRepository } from "$/domain/repositories/IssueRepository";
import { UCIssue } from "./common/UCIssue";
import { UCAnalysis } from "./common/UCAnalysis";
import i18n from "$/utils/i18n";
import { UCDataValue } from "$/domain/usecases/common/UCDataValue";

export class RunPractitionersValidationUseCase {
issueUseCase: UCIssue;
analysysUseCase: UCAnalysis;
private dataValueUseCase: UCDataValue;

constructor(
private analysisRepository: QualityAnalysisRepository,
Expand All @@ -29,6 +31,7 @@ export class RunPractitionersValidationUseCase {
) {
this.analysysUseCase = new UCAnalysis(this.analysisRepository);
this.issueUseCase = new UCIssue(this.issueRepository);
this.dataValueUseCase = new UCDataValue(this.dataValueRepository);
}

execute(options: PractitionersValidationOptions): FutureData<QualityAnalysis> {
Expand Down Expand Up @@ -346,20 +349,11 @@ export class RunPractitionersValidationUseCase {
}

private getDataValues(qualityAnalysis: QualityAnalysis): FutureData<DataValue[]> {
const $requests = _(qualityAnalysis.countriesAnalysis)
.chunk(1)
.map(countryIds => {
return this.dataValueRepository.get({
moduleIds: [qualityAnalysis.module.id],
countriesIds: countryIds,
period: _([qualityAnalysis.startDate, qualityAnalysis.endDate]).uniq().value(),
});
})
.value();

return Future.sequential($requests).flatMap(result => {
return Future.success(_(result).flatten().value());
});
return this.dataValueUseCase.get(
qualityAnalysis.countriesAnalysis,
[qualityAnalysis.module.id],
[qualityAnalysis.startDate, qualityAnalysis.endDate]
);
}

private getDataElementsByDisaggregationIds(
Expand Down
5 changes: 4 additions & 1 deletion src/domain/usecases/common/UCDataValue.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,16 @@ export class UCDataValue {
constructor(private dataValueRepository: DataValueRepository) {}

get(countriesIds: Id[], moduleIds: Id[], periods: Period[]): FutureData<DataValue[]> {
const [startDate, endDate] = periods;
if (!startDate || !endDate) throw new Error("Invalid period");
const periodsToSearch = _.range(Number(startDate), Number(endDate) + 1);
const $requests = _(countriesIds)
.chunk(1)
.map(countryIds => {
return this.dataValueRepository.get({
moduleIds: moduleIds,
countriesIds: countryIds,
period: _(periods).uniq().value(),
period: periodsToSearch.map(period => String(period)),
});
})
.value();
Expand Down
Loading