-
Notifications
You must be signed in to change notification settings - Fork 2
MS-1058 Prep work for sample upload with signed urls #1251
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
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
2edb836
MS-1058 Add experimental configuration flag for new sample upload str…
luhmirin-s 1f84b20
MS-1058 Add configuration fields for samples and up sync batching
luhmirin-s ee494aa
MS-1058 Add sample upload count to up sync request event content
luhmirin-s 10487f4
MS-1058 Add sample upsync request event with all the boilerplate
luhmirin-s 1d6f00a
MS-1058 Add sample upsync event scope upload to upsync task
luhmirin-s 551f5aa
Fix typo
luhmirin-s 83a7b62
MS-1058 Fix minor code style issues
luhmirin-s 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
61 changes: 61 additions & 0 deletions
61
...a/com/simprints/infra/config/store/local/migrations/ProjectConfigSampleUploadMigration.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,61 @@ | ||
| package com.simprints.infra.config.store.local.migrations | ||
|
|
||
| import androidx.datastore.core.DataMigration | ||
| import com.simprints.infra.config.store.local.models.ProtoProjectConfiguration | ||
| import com.simprints.infra.config.store.local.models.ProtoSampleSynchronizationConfiguration | ||
| import com.simprints.infra.logging.LoggingConstants.CrashReportTag.MIGRATION | ||
| import com.simprints.infra.logging.Simber | ||
| import javax.inject.Inject | ||
|
|
||
| /** | ||
| * Can be removed once all the devices have been updated to 2025.3.0 | ||
| */ | ||
| class ProjectConfigSampleUploadMigration @Inject constructor() : DataMigration<ProtoProjectConfiguration> { | ||
| override suspend fun cleanUp() { | ||
| Simber.i("Migration of project configuration sample upload is done", tag = MIGRATION) | ||
| } | ||
|
|
||
| override suspend fun shouldMigrate(currentData: ProtoProjectConfiguration) = with(currentData) { | ||
| val hasNoSamplesSyncObject = !synchronization.hasSamples() | ||
| val eventSyncBatchSizeIsEmpty = synchronization.up.simprints.batchSizes | ||
| .let { it.eventUpSyncs == 0 || it.eventDownSyncs == 0 } | ||
|
|
||
| hasNoSamplesSyncObject || eventSyncBatchSizeIsEmpty | ||
| } | ||
|
|
||
| override suspend fun migrate(currentData: ProtoProjectConfiguration): ProtoProjectConfiguration { | ||
| Simber.i("Start migration of project configuration sample upload", tag = MIGRATION) | ||
|
|
||
| val currentSyncConfig = currentData.synchronization | ||
| val currentBatchSizes = currentSyncConfig.up.simprints.batchSizes | ||
| val upBatchSizes = currentBatchSizes | ||
| .toBuilder() | ||
| .setEventUpSyncs(currentBatchSizes.upSyncs) | ||
| .setEventDownSyncs(currentBatchSizes.downSyncs) | ||
| .setSampleUpSyncs(DEFAULT_BATCH_SIZE) | ||
| .build() | ||
| val upSyncSimprintsConfig = currentSyncConfig.up.simprints | ||
| .toBuilder() | ||
| .setBatchSizes(upBatchSizes) | ||
| .build() | ||
| val upSyncConfig = currentSyncConfig.up | ||
| .toBuilder() | ||
| .setSimprints(upSyncSimprintsConfig) | ||
| .build() | ||
| val samplesConfig = ProtoSampleSynchronizationConfiguration.newBuilder().setSignedUrlBatchSize(DEFAULT_BATCH_SIZE).build() | ||
|
|
||
| return currentData | ||
| .toBuilder() | ||
| .setSynchronization( | ||
| currentSyncConfig | ||
| .toBuilder() | ||
| .setUp(upSyncConfig) | ||
| .setSamples(samplesConfig) | ||
| .build(), | ||
| ).build() | ||
| } | ||
|
|
||
| companion object { | ||
| private const val DEFAULT_BATCH_SIZE = 1 | ||
| } | ||
| } | ||
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
27 changes: 15 additions & 12 deletions
27
...c/main/java/com/simprints/infra/config/store/local/models/SynchronizationConfiguration.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 |
|---|---|---|
| @@ -1,30 +1,33 @@ | ||
| package com.simprints.infra.config.store.local.models | ||
|
|
||
| import com.simprints.infra.config.store.exceptions.InvalidProtobufEnumException | ||
| import com.simprints.infra.config.store.local.models.ProtoSynchronizationConfiguration.Frequency | ||
| import com.simprints.infra.config.store.models.SynchronizationConfiguration | ||
|
|
||
| internal fun SynchronizationConfiguration.toProto(): ProtoSynchronizationConfiguration = ProtoSynchronizationConfiguration | ||
| .newBuilder() | ||
| .setFrequency(frequency.toProto()) | ||
| .setDown(down.toProto()) | ||
| .setUp(up.toProto()) | ||
| .setSamples(samples.toProto()) | ||
| .build() | ||
|
|
||
| internal fun SynchronizationConfiguration.Frequency.toProto(): ProtoSynchronizationConfiguration.Frequency = when (this) { | ||
| SynchronizationConfiguration.Frequency.ONLY_PERIODICALLY_UP_SYNC -> ProtoSynchronizationConfiguration.Frequency.ONLY_PERIODICALLY_UP_SYNC | ||
| SynchronizationConfiguration.Frequency.PERIODICALLY -> ProtoSynchronizationConfiguration.Frequency.PERIODICALLY | ||
| SynchronizationConfiguration.Frequency.PERIODICALLY_AND_ON_SESSION_START -> ProtoSynchronizationConfiguration.Frequency.PERIODICALLY_AND_ON_SESSION_START | ||
| internal fun SynchronizationConfiguration.Frequency.toProto(): Frequency = when (this) { | ||
| SynchronizationConfiguration.Frequency.ONLY_PERIODICALLY_UP_SYNC -> Frequency.ONLY_PERIODICALLY_UP_SYNC | ||
| SynchronizationConfiguration.Frequency.PERIODICALLY -> Frequency.PERIODICALLY | ||
| SynchronizationConfiguration.Frequency.PERIODICALLY_AND_ON_SESSION_START -> Frequency.PERIODICALLY_AND_ON_SESSION_START | ||
| } | ||
|
|
||
| internal fun ProtoSynchronizationConfiguration.toDomain(): SynchronizationConfiguration = SynchronizationConfiguration( | ||
| frequency.toDomain(), | ||
| up.toDomain(), | ||
| down.toDomain(), | ||
| frequency = frequency.toDomain(), | ||
| up = up.toDomain(), | ||
| down = down.toDomain(), | ||
| samples = samples.toDomain(), | ||
| ) | ||
|
|
||
| internal fun ProtoSynchronizationConfiguration.Frequency.toDomain(): SynchronizationConfiguration.Frequency = when (this) { | ||
| ProtoSynchronizationConfiguration.Frequency.ONLY_PERIODICALLY_UP_SYNC -> SynchronizationConfiguration.Frequency.ONLY_PERIODICALLY_UP_SYNC | ||
| ProtoSynchronizationConfiguration.Frequency.PERIODICALLY -> SynchronizationConfiguration.Frequency.PERIODICALLY | ||
| ProtoSynchronizationConfiguration.Frequency.PERIODICALLY_AND_ON_SESSION_START -> SynchronizationConfiguration.Frequency.PERIODICALLY_AND_ON_SESSION_START | ||
| ProtoSynchronizationConfiguration.Frequency.UNRECOGNIZED -> throw InvalidProtobufEnumException("invalid Frequency $name") | ||
| internal fun Frequency.toDomain(): SynchronizationConfiguration.Frequency = when (this) { | ||
| Frequency.ONLY_PERIODICALLY_UP_SYNC -> SynchronizationConfiguration.Frequency.ONLY_PERIODICALLY_UP_SYNC | ||
| Frequency.PERIODICALLY -> SynchronizationConfiguration.Frequency.PERIODICALLY | ||
| Frequency.PERIODICALLY_AND_ON_SESSION_START -> SynchronizationConfiguration.Frequency.PERIODICALLY_AND_ON_SESSION_START | ||
| Frequency.UNRECOGNIZED -> throw InvalidProtobufEnumException("invalid Frequency $name") | ||
| } |
66 changes: 39 additions & 27 deletions
66
...main/java/com/simprints/infra/config/store/local/models/UpSynchronizationConfiguration.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 |
|---|---|---|
| @@ -1,66 +1,78 @@ | ||
| package com.simprints.infra.config.store.local.models | ||
|
|
||
| import com.simprints.infra.config.store.exceptions.InvalidProtobufEnumException | ||
| import com.simprints.infra.config.store.models.SampleSynchronizationConfiguration | ||
| import com.simprints.infra.config.store.models.UpSynchronizationConfiguration | ||
| import com.simprints.infra.config.store.models.UpSynchronizationConfiguration.UpSynchronizationKind | ||
|
|
||
| internal fun UpSynchronizationConfiguration.toProto(): ProtoUpSynchronizationConfiguration = ProtoUpSynchronizationConfiguration | ||
| .newBuilder() | ||
| .setSimprints(simprints.toProto()) | ||
| .setCoSync(coSync.toProto()) | ||
| .build() | ||
|
|
||
| internal fun UpSynchronizationConfiguration.SimprintsUpSynchronizationConfiguration.toProto(): ProtoUpSynchronizationConfiguration.SimprintsUpSynchronizationConfiguration = | ||
| internal fun UpSynchronizationConfiguration.SimprintsUpSynchronizationConfiguration.toProto() = | ||
| ProtoUpSynchronizationConfiguration.SimprintsUpSynchronizationConfiguration | ||
| .newBuilder() | ||
| .setKind(kind.toProto()) | ||
| .setBatchSizes(batchSizes.toProto()) | ||
| .setImagesRequireUnmeteredConnection(imagesRequireUnmeteredConnection) | ||
| .build() | ||
|
|
||
| internal fun UpSynchronizationConfiguration.CoSyncUpSynchronizationConfiguration.toProto(): ProtoUpSynchronizationConfiguration.CoSyncUpSynchronizationConfiguration = | ||
| internal fun UpSynchronizationConfiguration.CoSyncUpSynchronizationConfiguration.toProto() = | ||
| ProtoUpSynchronizationConfiguration.CoSyncUpSynchronizationConfiguration | ||
| .newBuilder() | ||
| .setKind(kind.toProto()) | ||
| .build() | ||
|
|
||
| internal fun UpSynchronizationConfiguration.UpSynchronizationKind.toProto(): ProtoUpSynchronizationConfiguration.UpSynchronizationKind = | ||
| when (this) { | ||
| UpSynchronizationConfiguration.UpSynchronizationKind.NONE -> ProtoUpSynchronizationConfiguration.UpSynchronizationKind.NONE | ||
| UpSynchronizationConfiguration.UpSynchronizationKind.ONLY_ANALYTICS -> ProtoUpSynchronizationConfiguration.UpSynchronizationKind.ONLY_ANALYTICS | ||
| UpSynchronizationConfiguration.UpSynchronizationKind.ONLY_BIOMETRICS -> ProtoUpSynchronizationConfiguration.UpSynchronizationKind.ONLY_BIOMETRICS | ||
| UpSynchronizationConfiguration.UpSynchronizationKind.ALL -> ProtoUpSynchronizationConfiguration.UpSynchronizationKind.ALL | ||
| } | ||
| internal fun UpSynchronizationKind.toProto(): ProtoUpSynchronizationConfiguration.UpSynchronizationKind = when (this) { | ||
| UpSynchronizationKind.NONE -> ProtoUpSynchronizationConfiguration.UpSynchronizationKind.NONE | ||
| UpSynchronizationKind.ONLY_ANALYTICS -> ProtoUpSynchronizationConfiguration.UpSynchronizationKind.ONLY_ANALYTICS | ||
| UpSynchronizationKind.ONLY_BIOMETRICS -> ProtoUpSynchronizationConfiguration.UpSynchronizationKind.ONLY_BIOMETRICS | ||
| UpSynchronizationKind.ALL -> ProtoUpSynchronizationConfiguration.UpSynchronizationKind.ALL | ||
| } | ||
|
|
||
| internal fun UpSynchronizationConfiguration.UpSyncBatchSizes.toProto(): ProtoUpSyncBatchSizes = ProtoUpSyncBatchSizes | ||
| internal fun UpSynchronizationConfiguration.UpSyncBatchSizes.toProto() = ProtoUpSyncBatchSizes | ||
| .newBuilder() | ||
| .setSessions(sessions) | ||
| .setUpSyncs(upSyncs) | ||
| .setDownSyncs(downSyncs) | ||
| .setEventUpSyncs(eventUpSyncs) | ||
| .setEventDownSyncs(eventDownSyncs) | ||
| .setSampleUpSyncs(sampleUpSyncs) | ||
| .build() | ||
|
|
||
| internal fun ProtoUpSynchronizationConfiguration.toDomain(): UpSynchronizationConfiguration = | ||
| UpSynchronizationConfiguration(simprints.toDomain(), coSync.toDomain()) | ||
| internal fun SampleSynchronizationConfiguration.toProto() = ProtoSampleSynchronizationConfiguration | ||
| .newBuilder() | ||
| .setSignedUrlBatchSize(signedUrlBatchSize) | ||
| .build() | ||
|
|
||
| internal fun ProtoUpSynchronizationConfiguration.toDomain() = UpSynchronizationConfiguration( | ||
| simprints.toDomain(), | ||
| coSync.toDomain(), | ||
| ) | ||
|
|
||
| internal fun ProtoUpSynchronizationConfiguration.SimprintsUpSynchronizationConfiguration.toDomain(): UpSynchronizationConfiguration.SimprintsUpSynchronizationConfiguration = | ||
| internal fun ProtoUpSynchronizationConfiguration.SimprintsUpSynchronizationConfiguration.toDomain() = | ||
| UpSynchronizationConfiguration.SimprintsUpSynchronizationConfiguration( | ||
| kind.toDomain(), | ||
| batchSizes.toDomain(), | ||
| imagesRequireUnmeteredConnection, | ||
| ) | ||
|
|
||
| internal fun ProtoUpSynchronizationConfiguration.CoSyncUpSynchronizationConfiguration.toDomain(): UpSynchronizationConfiguration.CoSyncUpSynchronizationConfiguration = | ||
| internal fun ProtoUpSynchronizationConfiguration.CoSyncUpSynchronizationConfiguration.toDomain() = | ||
| UpSynchronizationConfiguration.CoSyncUpSynchronizationConfiguration(kind.toDomain()) | ||
|
|
||
| internal fun ProtoUpSynchronizationConfiguration.UpSynchronizationKind.toDomain(): UpSynchronizationConfiguration.UpSynchronizationKind = | ||
| when (this) { | ||
| ProtoUpSynchronizationConfiguration.UpSynchronizationKind.NONE -> UpSynchronizationConfiguration.UpSynchronizationKind.NONE | ||
| ProtoUpSynchronizationConfiguration.UpSynchronizationKind.ONLY_ANALYTICS -> UpSynchronizationConfiguration.UpSynchronizationKind.ONLY_ANALYTICS | ||
| ProtoUpSynchronizationConfiguration.UpSynchronizationKind.ONLY_BIOMETRICS -> UpSynchronizationConfiguration.UpSynchronizationKind.ONLY_BIOMETRICS | ||
| ProtoUpSynchronizationConfiguration.UpSynchronizationKind.ALL -> UpSynchronizationConfiguration.UpSynchronizationKind.ALL | ||
| ProtoUpSynchronizationConfiguration.UpSynchronizationKind.UNRECOGNIZED -> throw InvalidProtobufEnumException( | ||
| "invalid UpSynchronizationKind $name", | ||
| ) | ||
| } | ||
| internal fun ProtoUpSynchronizationConfiguration.UpSynchronizationKind.toDomain() = when (this) { | ||
| ProtoUpSynchronizationConfiguration.UpSynchronizationKind.NONE -> UpSynchronizationKind.NONE | ||
| ProtoUpSynchronizationConfiguration.UpSynchronizationKind.ONLY_ANALYTICS -> UpSynchronizationKind.ONLY_ANALYTICS | ||
| ProtoUpSynchronizationConfiguration.UpSynchronizationKind.ONLY_BIOMETRICS -> UpSynchronizationKind.ONLY_BIOMETRICS | ||
| ProtoUpSynchronizationConfiguration.UpSynchronizationKind.ALL -> UpSynchronizationKind.ALL | ||
| ProtoUpSynchronizationConfiguration.UpSynchronizationKind.UNRECOGNIZED -> throw InvalidProtobufEnumException( | ||
| "invalid UpSynchronizationKind $name", | ||
| ) | ||
| } | ||
|
|
||
| internal fun ProtoUpSyncBatchSizes.toDomain(): UpSynchronizationConfiguration.UpSyncBatchSizes = | ||
| UpSynchronizationConfiguration.UpSyncBatchSizes(sessions, upSyncs, downSyncs) | ||
| UpSynchronizationConfiguration.UpSyncBatchSizes(sessions, eventUpSyncs, eventDownSyncs, sampleUpSyncs) | ||
|
|
||
| internal fun ProtoSampleSynchronizationConfiguration.toDomain() = SampleSynchronizationConfiguration( | ||
| signedUrlBatchSize = signedUrlBatchSize, | ||
| ) |
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.
This is just a general comment
Don't you find such conditions difficult to read? While it is a relatively short notation, wouldn't it be better to write such conditions in more human-friendly format?