-
Notifications
You must be signed in to change notification settings - Fork 63
chore: [ANDROSDK-2183] Review online order clause in event query #2497
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
Open
taridepaco
wants to merge
11
commits into
develop
Choose a base branch
from
ANDROSDK-2183
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+303
−39
Open
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
bc3d61e
[ANDROSDK-2183] fix column order for event query
taridepaco 2b61103
[ANDROSDK-2183] fix scope helper
taridepaco f20a45a
[ANDROSDK-2183] use dynamic TrackerExporter version when parsing Even…
taridepaco 0802b22
[ANDROSDK-2183] parse with alternate tracker exporter naming as fallback
taridepaco 976bf68
[ANDROSDK-2183] refactor version resolver
taridepaco ca0cb85
[ANDROSDK-2183] fix tests
taridepaco 490a33e
[ANDROSDK-2183] fix format
taridepaco 72db88d
[ANDROSDK-2183] remove test from download metadata test class
taridepaco 89f006e
[ANDROSDK-2183] simplify filter column parsing logic
taridepaco 1651555
[ANDROSDK-2183] remove unused parameters
taridepaco 758940f
[ANDROSDK-2183] fix imports
taridepaco File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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
62 changes: 62 additions & 0 deletions
62
core/src/main/java/org/hisp/dhis/android/core/event/search/EventQueryScopeOrderApiName.kt
This file contains hidden or 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,62 @@ | ||
| /* | ||
| * Copyright (c) 2004-2025, 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.event.search | ||
|
|
||
| import org.hisp.dhis.android.core.tracker.TrackerExporterVersion | ||
|
|
||
| sealed class EventQueryScopeOrderApiName( | ||
| private val v1Name: String?, | ||
| private val v2Name: String?, | ||
| ) { | ||
| data object Event : EventQueryScopeOrderApiName("event", "event") | ||
| data object Program : EventQueryScopeOrderApiName("program", "program") | ||
| data object ProgramStage : EventQueryScopeOrderApiName("programStage", "programStage") | ||
| data object Enrollment : EventQueryScopeOrderApiName("enrollment", "enrollment") | ||
| data object EnrollmentStatus : EventQueryScopeOrderApiName("enrollmentStatus", "enrollmentStatus") | ||
| data object OrgUnit : EventQueryScopeOrderApiName("orgUnit", "orgUnit") | ||
| data object OrgUnitName : EventQueryScopeOrderApiName("orgUnitName", "orgUnitName") | ||
| data object TrackedEntityInstance : EventQueryScopeOrderApiName("trackedEntityInstance", "trackedEntity") | ||
| data object EventDate : EventQueryScopeOrderApiName("eventDate", "occurredAt") | ||
| data object FollowUp : EventQueryScopeOrderApiName("followup", "followup") | ||
| data object Status : EventQueryScopeOrderApiName("status", "status") | ||
| data object DueDate : EventQueryScopeOrderApiName("dueDate", "scheduledAt") | ||
| data object StoredBy : EventQueryScopeOrderApiName("storedBy", "storedBy") | ||
| data object Created : EventQueryScopeOrderApiName("created", "createdAt") | ||
| data object LastUpdated : EventQueryScopeOrderApiName("lastUpdated", "updatedAt") | ||
| data object CompletedBy : EventQueryScopeOrderApiName("completedBy", "completedBy") | ||
| data object CompletedDate : EventQueryScopeOrderApiName("completedDate", "completedAt") | ||
| class DataElement(dataElementId: String) : EventQueryScopeOrderApiName(dataElementId, dataElementId) | ||
|
|
||
| fun getApiName(version: TrackerExporterVersion): String? { | ||
| return when (version) { | ||
| TrackerExporterVersion.V1 -> v1Name | ||
| TrackerExporterVersion.V2 -> v2Name | ||
| } | ||
| } | ||
| } |
This file contains hidden or 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
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Isn't it hardcoded here that the version is always V1?