-
Notifications
You must be signed in to change notification settings - Fork 62
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1814 from dhis2/1.6.2-rc
fix: [1.6.2-rc] Version 1.6.2
- Loading branch information
Showing
144 changed files
with
5,067 additions
and
1,695 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -32,6 +32,7 @@ | |
|
|
||
| import org.junit.Before; | ||
|
|
||
|
|
||
| import java.io.IOException; | ||
|
|
||
| import io.reactivex.schedulers.Schedulers; | ||
|
|
||
130 changes: 130 additions & 0 deletions
130
...ore/analytics/aggregated/internal/evaluator/EventDataItemSQLEvaluatorIntegrationShould.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,130 @@ | ||
| /* | ||
| * Copyright (c) 2004-2022, University of Oslo | ||
| * All rights reserved. | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions are met: | ||
| * Redistributions of source code must retain the above copyright notice, this | ||
| * list of conditions and the following disclaimer. | ||
| * | ||
| * Redistributions in binary form must reproduce the above copyright notice, | ||
| * this list of conditions and the following disclaimer in the documentation | ||
| * and/or other materials provided with the distribution. | ||
| * Neither the name of the HISP project nor the names of its contributors may | ||
| * be used to endorse or promote products derived from this software without | ||
| * specific prior written permission. | ||
| * | ||
| * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND | ||
| * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
| * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
| * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR | ||
| * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
| * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
| * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON | ||
| * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
| * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| */ | ||
| package org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator | ||
|
|
||
| import com.google.common.truth.Truth.assertThat | ||
| import org.hisp.dhis.android.core.analytics.aggregated.DimensionItem | ||
| import org.hisp.dhis.android.core.analytics.aggregated.MetadataItem | ||
| import org.hisp.dhis.android.core.analytics.aggregated.internal.AnalyticsServiceEvaluationItem | ||
| import org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.BaseEvaluatorSamples.attribute1 | ||
| import org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.BaseEvaluatorSamples.dataElement1 | ||
| import org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.BaseEvaluatorSamples.firstNovember2019 | ||
| import org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.BaseEvaluatorSamples.generator | ||
| import org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.BaseEvaluatorSamples.orgunitChild1 | ||
| import org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.BaseEvaluatorSamples.program | ||
| import org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.BaseEvaluatorSamples.programStage1 | ||
| import org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.BaseEvaluatorSamples.trackedEntity1 | ||
| import org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.BaseEvaluatorSamples.trackedEntity2 | ||
| import org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.BaseEvaluatorSamples.trackedEntityType | ||
| import org.hisp.dhis.android.core.common.RelativePeriod | ||
| import org.hisp.dhis.android.core.dataelement.DataElement | ||
| import org.hisp.dhis.android.core.program.Program | ||
| import org.hisp.dhis.android.core.program.programindicatorengine.BaseTrackerDataIntegrationHelper | ||
| import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute | ||
| import org.hisp.dhis.android.core.utils.runner.D2JunitRunner | ||
| import org.junit.Test | ||
| import org.junit.runner.RunWith | ||
|
|
||
| @RunWith(D2JunitRunner::class) | ||
| internal class EventDataItemSQLEvaluatorIntegrationShould : BaseEvaluatorIntegrationShould() { | ||
|
|
||
| private val eventDataItemEvaluator = EventDataItemSQLEvaluator(databaseAdapter) | ||
|
|
||
| private val helper = BaseTrackerDataIntegrationHelper(databaseAdapter) | ||
|
|
||
| @Test | ||
| fun should_aggregate_data_from_multiple_teis() { | ||
| helper.createTrackedEntity(trackedEntity1.uid(), orgunitChild1.uid(), trackedEntityType.uid()) | ||
| val enrollment1 = generator.generate() | ||
| helper.createEnrollment(trackedEntity1.uid(), enrollment1, program.uid(), orgunitChild1.uid()) | ||
| val event1 = generator.generate() | ||
| helper.createTrackerEvent( | ||
| event1, enrollment1, program.uid(), programStage1.uid(), orgunitChild1.uid(), | ||
| eventDate = firstNovember2019 | ||
| ) | ||
|
|
||
| helper.createTrackedEntity(trackedEntity2.uid(), orgunitChild1.uid(), trackedEntityType.uid()) | ||
| val enrollment2 = generator.generate() | ||
| helper.createEnrollment(trackedEntity2.uid(), enrollment2, program.uid(), orgunitChild1.uid()) | ||
| val event2 = generator.generate() | ||
| helper.createTrackerEvent( | ||
| event2, enrollment2, program.uid(), programStage1.uid(), orgunitChild1.uid(), | ||
| eventDate = firstNovember2019 | ||
| ) | ||
|
|
||
| helper.insertTrackedEntityDataValue(event1, dataElement1.uid(), "10") | ||
| helper.insertTrackedEntityDataValue(event2, dataElement1.uid(), "20") | ||
|
|
||
| val eventDataValue = evaluateEventDataElement(program, dataElement1) | ||
| assertThat(eventDataValue).isEqualTo("30") | ||
|
|
||
| helper.insertTrackedEntityAttributeValue(trackedEntity1.uid(), attribute1.uid(), "5") | ||
| helper.insertTrackedEntityAttributeValue(trackedEntity2.uid(), attribute1.uid(), "3") | ||
|
|
||
| val attributeValue = evaluateEventAttribute(program, attribute1) | ||
| assertThat(attributeValue).isEqualTo("8") | ||
| } | ||
|
|
||
| private fun evaluateEventDataElement(program: Program, dataElement: DataElement): String? { | ||
| val evaluationItem = AnalyticsServiceEvaluationItem( | ||
| dimensionItems = listOf( | ||
| DimensionItem.DataItem.EventDataItem.DataElement(program.uid(), dataElement.uid()) | ||
| ), | ||
| filters = listOf( | ||
| DimensionItem.OrganisationUnitItem.Absolute(BaseEvaluatorSamples.orgunitParent.uid()), | ||
| DimensionItem.PeriodItem.Relative(RelativePeriod.LAST_MONTH) | ||
| ) | ||
| ) | ||
|
|
||
| val metadataItem = MetadataItem.EventDataElementItem(dataElement, program) | ||
|
|
||
| return eventDataItemEvaluator.evaluate( | ||
| evaluationItem, | ||
| metadata + (metadataItem.id to metadataItem) | ||
| ) | ||
| } | ||
|
|
||
| private fun evaluateEventAttribute(program: Program, attribute: TrackedEntityAttribute): String? { | ||
| val evaluationItem = AnalyticsServiceEvaluationItem( | ||
| dimensionItems = listOf( | ||
| DimensionItem.DataItem.EventDataItem.Attribute(program.uid(), attribute.uid()) | ||
| ), | ||
| filters = listOf( | ||
| DimensionItem.OrganisationUnitItem.Absolute(BaseEvaluatorSamples.orgunitParent.uid()), | ||
| DimensionItem.PeriodItem.Relative(RelativePeriod.LAST_MONTH) | ||
| ) | ||
| ) | ||
|
|
||
| val metadataItem = MetadataItem.EventAttributeItem(attribute, program) | ||
|
|
||
| return eventDataItemEvaluator.evaluate( | ||
| evaluationItem, | ||
| metadata + (metadataItem.id to metadataItem) | ||
| ) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
81 changes: 0 additions & 81 deletions
81
...dhis/android/core/data/database/IdentifiableDataObjectStoreAbstractIntegrationShould.java
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.