V2-4 : placements multi-device (report_bytes, tables 000015, copies UI)
This commit is contained in:
+7
@@ -83,4 +83,11 @@ object PendingOperationType {
|
||||
const val UPDATE_SHARE = "update_share"
|
||||
const val CREATE_LINK = "create_link"
|
||||
const val REVOKE_LINK = "revoke_link"
|
||||
/**
|
||||
* V2 placements : signalement de présence d'octets (`{ hasBytes }`).
|
||||
* Hint, jamais bloquant : un échec est dead-letter + suite du batch
|
||||
* (voir `OutboxSyncWorker`), et chaque changement d'état exige un nouvel
|
||||
* `operation_id` (garde anti-rejeu serveur A9).
|
||||
*/
|
||||
const val REPORT_BYTES = "report_bytes"
|
||||
}
|
||||
@@ -17,6 +17,7 @@ import com.kazier.mobile.data.remote.dto.LoginRequestDto
|
||||
import com.kazier.mobile.data.remote.dto.LoginResponseDto
|
||||
import com.kazier.mobile.data.remote.dto.OcrJobDto
|
||||
import com.kazier.mobile.data.remote.dto.OcrSubmitDto
|
||||
import com.kazier.mobile.data.remote.dto.PlacementDto
|
||||
import com.kazier.mobile.data.remote.dto.ResolvedUserDto
|
||||
import com.kazier.mobile.data.remote.dto.ResourcePermissionDto
|
||||
import com.kazier.mobile.data.remote.dto.ShareGrantDto
|
||||
@@ -176,6 +177,13 @@ class ApiClient @Inject constructor(
|
||||
suspend fun listLinks(fileId: String): List<ShareLinkDto> =
|
||||
unwrap({ apiService.listLinks(fileId) })
|
||||
|
||||
/**
|
||||
* Présence des octets d'une ressource possédée —
|
||||
* `GET /files/:id/placements` (owner uniquement, 404 sinon, V2).
|
||||
*/
|
||||
suspend fun listPlacements(fileId: String): List<PlacementDto> =
|
||||
unwrap({ apiService.listPlacements(fileId) })
|
||||
|
||||
/**
|
||||
* Octets physiques d'un fichier visible — `GET /files/:id/content`
|
||||
* (binaire brut, hors enveloppe). Streaming sans cache : lecture bornée
|
||||
|
||||
@@ -11,6 +11,7 @@ import com.kazier.mobile.data.remote.dto.LoginRequestDto
|
||||
import com.kazier.mobile.data.remote.dto.LoginResponseDto
|
||||
import com.kazier.mobile.data.remote.dto.OcrJobDto
|
||||
import com.kazier.mobile.data.remote.dto.OcrSubmitDto
|
||||
import com.kazier.mobile.data.remote.dto.PlacementDto
|
||||
import com.kazier.mobile.data.remote.dto.ResolvedUserDto
|
||||
import com.kazier.mobile.data.remote.dto.ResourcePermissionDto
|
||||
import com.kazier.mobile.data.remote.dto.ShareGrantDto
|
||||
@@ -187,4 +188,14 @@ interface ApiService {
|
||||
suspend fun listLinks(
|
||||
@Path("id") fileId: String,
|
||||
): Response<ApiEnvelope<List<ShareLinkDto>>>
|
||||
|
||||
/**
|
||||
* Présence des octets d'une ressource possédée
|
||||
* (`GET /files/:id/placements`, owner uniquement — entrée `server`
|
||||
* implicite + reports devices, V2).
|
||||
*/
|
||||
@GET("files/{id}/placements")
|
||||
suspend fun listPlacements(
|
||||
@Path("id") fileId: String,
|
||||
): Response<ApiEnvelope<List<PlacementDto>>>
|
||||
}
|
||||
@@ -118,6 +118,18 @@ data class ShareLinkDto(
|
||||
@Json(name = "expiresAt") val expiresAt: String? = null,
|
||||
)
|
||||
|
||||
/**
|
||||
* Entrée de présence `GET /files/:id/placements` (owner uniquement, V2) —
|
||||
* miroir de `PlacementDTO` Go. L'entrée `server` est implicite (dérivée de
|
||||
* `has_content`) ; les entrées devices viennent des reports `report_bytes`.
|
||||
*/
|
||||
data class PlacementDto(
|
||||
@Json(name = "locationType") val locationType: String,
|
||||
@Json(name = "deviceId") val deviceId: String? = null,
|
||||
@Json(name = "hasBytes") val hasBytes: Boolean,
|
||||
@Json(name = "updatedAt") val updatedAt: String? = null,
|
||||
)
|
||||
|
||||
/**
|
||||
* Grant actif `GET /files/:id/shares` (owner uniquement) — miroir de
|
||||
* `ShareGrantDTO` Go. `expiresAt` en ms epoch (null = jamais), même
|
||||
|
||||
@@ -219,6 +219,23 @@ class OutboxRepository @Inject constructor(
|
||||
payload = mapOf("token" to token),
|
||||
)
|
||||
|
||||
/**
|
||||
* Raccourci `report_bytes` — payload `{ hasBytes }` (V2 placements).
|
||||
* Uniquement sur changement d'état réel (upload/download/release/delete
|
||||
* locale) : le serveur exige un `operation_id` frais par état (A9) et
|
||||
* l'échec est dead-letter sans bloquer la file.
|
||||
*/
|
||||
suspend fun enqueueReportBytes(
|
||||
resourceId: String,
|
||||
resourceType: String,
|
||||
hasBytes: Boolean,
|
||||
): String = enqueue(
|
||||
operation = PendingOperationType.REPORT_BYTES,
|
||||
resourceId = resourceId,
|
||||
resourceType = resourceType,
|
||||
payload = mapOf("hasBytes" to hasBytes),
|
||||
)
|
||||
|
||||
/** Nombre d'ops en attente de push (stats UI optionnelles). */
|
||||
suspend fun countPending(): Int = pendingOperationDao.countPending()
|
||||
|
||||
|
||||
+5
-1
@@ -39,6 +39,7 @@ class RemoteContentRepository @Inject constructor(
|
||||
private val fileDao: FileDao,
|
||||
private val folderDao: FolderDao,
|
||||
private val defaultRootStore: DefaultRootStore,
|
||||
private val outboxRepository: OutboxRepository,
|
||||
@ApplicationContext private val context: Context,
|
||||
) {
|
||||
/** Octets du fichier, bornés ([ApiClient.MAX_CONTENT_BYTES]). */
|
||||
@@ -47,7 +48,8 @@ class RemoteContentRepository @Inject constructor(
|
||||
|
||||
/**
|
||||
* Pousse les octets locaux vers le serveur (overwrite ciblé idempotent).
|
||||
* Succès → `bytes_uploaded = 1` ; 4xx (trop gros, rejeté) → +1 tentative
|
||||
* Succès → `bytes_uploaded = 1` + report `hasBytes = true` (V2
|
||||
* placements, état frais) ; 4xx (trop gros, rejeté) → +1 tentative
|
||||
* (cap 3, le worker passe au suivant) ; réseau/5xx → `Retryable` sans
|
||||
* toucher au compteur ; 401 → `Unauthorized` (re-login via l'UI).
|
||||
*/
|
||||
@@ -61,6 +63,7 @@ class RemoteContentRepository @Inject constructor(
|
||||
)
|
||||
apiClient.uploadFile(file = part, resourceId = file.resourceId)
|
||||
fileDao.markBytesUploaded(file.resourceId, System.currentTimeMillis())
|
||||
outboxRepository.enqueueReportBytes(file.resourceId, "file", true)
|
||||
BytesUploadOutcome.Done
|
||||
} catch (e: ApiException) {
|
||||
when {
|
||||
@@ -120,6 +123,7 @@ class RemoteContentRepository @Inject constructor(
|
||||
}
|
||||
if (createdUri == null) return DownloadOutcome.Retryable
|
||||
fileDao.attachDownloaded(file.resourceId, createdUri, target.folderId, bytes.size.toLong(), now)
|
||||
outboxRepository.enqueueReportBytes(file.resourceId, "file", true)
|
||||
return DownloadOutcome.Done
|
||||
}
|
||||
|
||||
|
||||
@@ -72,6 +72,8 @@ class FileDeleter @Inject constructor(
|
||||
if (deleted) {
|
||||
fileRepository.markMissing(file.resourceId, System.currentTimeMillis())
|
||||
thumbnailStore.delete(file.resourceId)
|
||||
// Octets partis : le serveur doit l'apprendre (V2 placements).
|
||||
outboxRepository.enqueueReportBytes(file.resourceId, "file", false)
|
||||
Timber.d("deleted locally %s", uri)
|
||||
} else {
|
||||
Timber.w("deleteDocument returned false for %s", uri)
|
||||
@@ -174,6 +176,8 @@ class FileDeleter @Inject constructor(
|
||||
}.getOrDefault(false)
|
||||
if (deleted) {
|
||||
thumbnailStore.delete(file.resourceId)
|
||||
// Rattrapage : ces octets n'avaient jamais été signalés partis.
|
||||
outboxRepository.enqueueReportBytes(file.resourceId, "file", false)
|
||||
swept++
|
||||
}
|
||||
}
|
||||
@@ -212,6 +216,8 @@ class FileDeleter @Inject constructor(
|
||||
} else {
|
||||
fileRepository.detachLocalCopy(file.resourceId)
|
||||
thumbnailStore.delete(file.resourceId)
|
||||
// Octets partis : le serveur doit l'apprendre (V2).
|
||||
outboxRepository.enqueueReportBytes(file.resourceId, "file", false)
|
||||
released++
|
||||
Timber.d("released local copy %s", uri)
|
||||
}
|
||||
|
||||
+12
-2
@@ -168,7 +168,10 @@ class OutboxSyncWorker @AssistedInject constructor(
|
||||
}
|
||||
|
||||
// Première erreur non-idempotente → dead-letter + cascade éventuelle.
|
||||
result.failed?.let { fail ->
|
||||
// (if explicite plutôt que `?.let` : le `continue` V2 ci-dessous
|
||||
// est interdit dans un lambda inline.)
|
||||
val fail = result.failed
|
||||
if (fail != null) {
|
||||
val failedIndex = pending.indexOfFirst { it.operationId == fail.operationId }
|
||||
if (failedIndex < 0) {
|
||||
// Garde C7 : `operation_id` inconnu → stop, pas de boucle
|
||||
@@ -179,6 +182,13 @@ class OutboxSyncWorker @AssistedInject constructor(
|
||||
val failedOp = pending[failedIndex]
|
||||
pendingOperationDao.markFailed(failedOp.id, now)
|
||||
Timber.w("outbox failed %s (%s: %s)", fail.operationId, fail.code, fail.message)
|
||||
if (failedOp.operation == PendingOperationType.REPORT_BYTES) {
|
||||
// V2 placements : un hint périmé (partage révoqué,
|
||||
// ressource supprimée côté serveur) ne doit jamais
|
||||
// bloquer la file — dead-letter et suite du batch
|
||||
// (re-sélection du pending restant).
|
||||
continue
|
||||
}
|
||||
if (failedOp.operation == PendingOperationType.CREATE_RESOURCE) {
|
||||
failedOp.resourceId?.let { resourceId ->
|
||||
pendingOperationDao.failDescendants(resourceId, now)
|
||||
@@ -187,7 +197,7 @@ class OutboxSyncWorker @AssistedInject constructor(
|
||||
}
|
||||
// C6 : stop au 1er échec — le serveur s'est arrêté là, tout ce
|
||||
// qui suit reste pending pour le prochain run (jamais de
|
||||
// `continue` vers le batch suivant).
|
||||
// `continue` vers le batch suivant, sauf hint V2 ci-dessus).
|
||||
return Result.success()
|
||||
}
|
||||
|
||||
|
||||
@@ -14,10 +14,12 @@ import androidx.compose.foundation.rememberScrollState
|
||||
import androidx.compose.foundation.verticalScroll
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.filled.Check
|
||||
import androidx.compose.material.icons.filled.Cloud
|
||||
import androidx.compose.material.icons.filled.ContentCopy
|
||||
import androidx.compose.material.icons.filled.Delete
|
||||
import androidx.compose.material.icons.filled.Link
|
||||
import androidx.compose.material.icons.filled.Share
|
||||
import androidx.compose.material.icons.filled.Smartphone
|
||||
import androidx.compose.material3.AlertDialog
|
||||
import androidx.compose.material3.Button
|
||||
import androidx.compose.material3.Card
|
||||
@@ -146,6 +148,7 @@ fun ShareBottomSheet(
|
||||
},
|
||||
onRevoke = { grant -> viewModel.revoke(resourceId, resourceType, grant) },
|
||||
)
|
||||
PlacementsSection(placements = state.placements)
|
||||
AddShareSection(
|
||||
sharing = state.sharing,
|
||||
error = state.error,
|
||||
@@ -223,6 +226,58 @@ private fun SectionTitle(text: String) {
|
||||
)
|
||||
}
|
||||
|
||||
/** Copies des octets (V2) : serveur + devices ayant reporté. */
|
||||
@Composable
|
||||
private fun PlacementsSection(placements: List<PlacementUi>) {
|
||||
SectionTitle(stringResource(R.string.share_section_copies))
|
||||
if (placements.isEmpty()) {
|
||||
Text(
|
||||
text = stringResource(R.string.share_empty_copies),
|
||||
style = MaterialTheme.typography.bodyMedium,
|
||||
color = MaterialTheme.colorScheme.onSurfaceVariant,
|
||||
)
|
||||
} else {
|
||||
placements.forEach { placement ->
|
||||
Row(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
horizontalArrangement = Arrangement.spacedBy(8.dp),
|
||||
) {
|
||||
Icon(
|
||||
imageVector = if (placement.locationType == "server") Icons.Filled.Cloud else Icons.Filled.Smartphone,
|
||||
contentDescription = null,
|
||||
tint = MaterialTheme.colorScheme.onSurfaceVariant,
|
||||
modifier = Modifier.size(20.dp),
|
||||
)
|
||||
Text(
|
||||
text = placementLabel(placement),
|
||||
style = MaterialTheme.typography.bodyMedium,
|
||||
modifier = Modifier.weight(1f),
|
||||
maxLines = 1,
|
||||
)
|
||||
Text(
|
||||
text = stringResource(
|
||||
if (placement.hasBytes) R.string.share_copy_present
|
||||
else R.string.share_copy_absent,
|
||||
),
|
||||
style = MaterialTheme.typography.labelMedium,
|
||||
color = if (placement.hasBytes) MaterialTheme.colorScheme.primary
|
||||
else MaterialTheme.colorScheme.onSurfaceVariant,
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun placementLabel(placement: PlacementUi): String =
|
||||
if (placement.locationType == "server") {
|
||||
stringResource(R.string.share_copy_server)
|
||||
} else {
|
||||
val id = placement.deviceId?.take(8).orEmpty()
|
||||
stringResource(R.string.share_copy_device, id)
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun GrantsSection(
|
||||
grants: List<ShareGrantUi>,
|
||||
|
||||
@@ -53,6 +53,13 @@ data class ResolvedLinkUi(
|
||||
val access: String,
|
||||
)
|
||||
|
||||
/** Entrée de présence des octets (V2) affichée dans le sheet. */
|
||||
data class PlacementUi(
|
||||
val locationType: String,
|
||||
val deviceId: String?,
|
||||
val hasBytes: Boolean,
|
||||
)
|
||||
|
||||
data class ShareUiState(
|
||||
val loading: Boolean = false,
|
||||
/** Cible courante du sheet (resource partagée). */
|
||||
@@ -60,6 +67,8 @@ data class ShareUiState(
|
||||
val resourceType: String? = null,
|
||||
val shares: List<ShareGrantUi> = emptyList(),
|
||||
val links: List<ShareLinkUi> = emptyList(),
|
||||
/** Présence des octets (serveur + reports devices, V2). */
|
||||
val placements: List<PlacementUi> = emptyList(),
|
||||
/** Ops de partage en attente d'envoi (pas encore reflétées serveur). */
|
||||
val pendingCount: Int = 0,
|
||||
/** Erreur de chargement des listes (`LOAD_FAILED`, `FORBIDDEN`). */
|
||||
@@ -122,9 +131,10 @@ class ShareViewModel @Inject constructor(
|
||||
runCatching {
|
||||
val shares = apiClient.listShares(resourceId)
|
||||
val links = apiClient.listLinks(resourceId)
|
||||
val placements = apiClient.listPlacements(resourceId)
|
||||
val pending = outboxRepository.pendingShareOps(resourceId).size
|
||||
Triple(shares, links, pending)
|
||||
}.onSuccess { (shares, links, pending) ->
|
||||
Quad(shares, links, placements, pending)
|
||||
}.onSuccess { (shares, links, placements, pending) ->
|
||||
val now = System.currentTimeMillis()
|
||||
_uiState.update {
|
||||
it.copy(
|
||||
@@ -147,6 +157,13 @@ class ShareViewModel @Inject constructor(
|
||||
url = ShareLinkParser.shareUrl(dto.token),
|
||||
)
|
||||
},
|
||||
placements = placements.map { dto ->
|
||||
PlacementUi(
|
||||
locationType = dto.locationType,
|
||||
deviceId = dto.deviceId,
|
||||
hasBytes = dto.hasBytes,
|
||||
)
|
||||
},
|
||||
pendingCount = pending,
|
||||
)
|
||||
}
|
||||
@@ -364,3 +381,6 @@ class ShareViewModel @Inject constructor(
|
||||
super.onCleared()
|
||||
}
|
||||
}
|
||||
|
||||
/** Quadruplet local (pas de Tuple4 stdlib en Kotlin). */
|
||||
private data class Quad<A, B, C, D>(val first: A, val second: B, val third: C, val fourth: D)
|
||||
|
||||
@@ -326,6 +326,12 @@
|
||||
<string name="share_enqueued">Share saved — syncing.</string>
|
||||
<string name="share_pending">%1$d change(s) pending upload.</string>
|
||||
<string name="share_section_grants">People with access</string>
|
||||
<string name="share_section_copies">File copies</string>
|
||||
<string name="share_empty_copies">No known copies.</string>
|
||||
<string name="share_copy_server">Server</string>
|
||||
<string name="share_copy_device">Device %1$s</string>
|
||||
<string name="share_copy_present">bytes present</string>
|
||||
<string name="share_copy_absent">no bytes</string>
|
||||
<string name="share_section_add">Add access</string>
|
||||
<string name="share_section_links">Public links</string>
|
||||
<string name="share_section_open_link">Open a received link</string>
|
||||
|
||||
@@ -327,6 +327,12 @@
|
||||
<string name="share_enqueued">Partage enregistré — synchronisation en cours.</string>
|
||||
<string name="share_pending">%1$d modification(s) en attente d\'envoi.</string>
|
||||
<string name="share_section_grants">Personnes avec accès</string>
|
||||
<string name="share_section_copies">Copies des fichiers</string>
|
||||
<string name="share_empty_copies">Aucune copie connue.</string>
|
||||
<string name="share_copy_server">Serveur</string>
|
||||
<string name="share_copy_device">Appareil %1$s</string>
|
||||
<string name="share_copy_present">octets présents</string>
|
||||
<string name="share_copy_absent">sans octets</string>
|
||||
<string name="share_section_add">Ajouter un accès</string>
|
||||
<string name="share_section_links">Liens publics</string>
|
||||
<string name="share_section_open_link">Ouvrir un lien reçu</string>
|
||||
|
||||
@@ -22,6 +22,7 @@ import com.kazier.mobile.data.remote.dto.LoginRequestDto
|
||||
import com.kazier.mobile.data.remote.dto.LoginResponseDto
|
||||
import com.kazier.mobile.data.remote.dto.OcrJobDto
|
||||
import com.kazier.mobile.data.remote.dto.OcrSubmitDto
|
||||
import com.kazier.mobile.data.remote.dto.PlacementDto
|
||||
import com.kazier.mobile.data.remote.dto.ResolvedUserDto
|
||||
import com.kazier.mobile.data.remote.dto.ResourcePermissionDto
|
||||
import com.kazier.mobile.data.remote.dto.ShareLinkDto
|
||||
@@ -332,5 +333,9 @@ class Auth401Test {
|
||||
override suspend fun listLinks(
|
||||
fileId: String,
|
||||
): Response<ApiEnvelope<List<ShareLinkDto>>> = Response.success(ApiEnvelope(data = emptyList()))
|
||||
|
||||
override suspend fun listPlacements(
|
||||
fileId: String,
|
||||
): Response<ApiEnvelope<List<PlacementDto>>> = Response.success(ApiEnvelope(data = emptyList()))
|
||||
}
|
||||
}
|
||||
|
||||
@@ -18,6 +18,7 @@ import com.kazier.mobile.data.remote.dto.LoginRequestDto
|
||||
import com.kazier.mobile.data.remote.dto.LoginResponseDto
|
||||
import com.kazier.mobile.data.remote.dto.OcrJobDto
|
||||
import com.kazier.mobile.data.remote.dto.OcrSubmitDto
|
||||
import com.kazier.mobile.data.remote.dto.PlacementDto
|
||||
import com.kazier.mobile.data.remote.dto.ResolvedUserDto
|
||||
import com.kazier.mobile.data.remote.dto.ResourcePermissionDto
|
||||
import com.kazier.mobile.data.remote.dto.ShareLinkDto
|
||||
@@ -206,5 +207,9 @@ class PaginationTest {
|
||||
override suspend fun listLinks(
|
||||
fileId: String,
|
||||
): Response<ApiEnvelope<List<ShareLinkDto>>> = Response.success(ApiEnvelope(data = emptyList()))
|
||||
|
||||
override suspend fun listPlacements(
|
||||
fileId: String,
|
||||
): Response<ApiEnvelope<List<PlacementDto>>> = Response.success(ApiEnvelope(data = emptyList()))
|
||||
}
|
||||
}
|
||||
|
||||
@@ -13,6 +13,7 @@ import com.kazier.mobile.data.remote.dto.LoginRequestDto
|
||||
import com.kazier.mobile.data.remote.dto.LoginResponseDto
|
||||
import com.kazier.mobile.data.remote.dto.OcrJobDto
|
||||
import com.kazier.mobile.data.remote.dto.OcrSubmitDto
|
||||
import com.kazier.mobile.data.remote.dto.PlacementDto
|
||||
import com.kazier.mobile.data.remote.dto.ResolvedUserDto
|
||||
import com.kazier.mobile.data.remote.dto.ResourcePermissionDto
|
||||
import com.kazier.mobile.data.remote.dto.ShareLinkDto
|
||||
@@ -145,5 +146,9 @@ class RemoteContentTest {
|
||||
override suspend fun listLinks(
|
||||
fileId: String,
|
||||
): Response<ApiEnvelope<List<ShareLinkDto>>> = Response.success(ApiEnvelope(data = emptyList()))
|
||||
|
||||
override suspend fun listPlacements(
|
||||
fileId: String,
|
||||
): Response<ApiEnvelope<List<PlacementDto>>> = Response.success(ApiEnvelope(data = emptyList()))
|
||||
}
|
||||
}
|
||||
|
||||
@@ -25,6 +25,7 @@ import com.kazier.mobile.data.remote.dto.LoginRequestDto
|
||||
import com.kazier.mobile.data.remote.dto.LoginResponseDto
|
||||
import com.kazier.mobile.data.remote.dto.OcrJobDto
|
||||
import com.kazier.mobile.data.remote.dto.OcrSubmitDto
|
||||
import com.kazier.mobile.data.remote.dto.PlacementDto
|
||||
import com.kazier.mobile.data.remote.dto.ResolvedUserDto
|
||||
import com.kazier.mobile.data.remote.dto.ResourcePermissionDto
|
||||
import com.kazier.mobile.data.remote.dto.ShareGrantDto
|
||||
@@ -336,5 +337,9 @@ class SessionReloginTest {
|
||||
|
||||
override suspend fun listLinks(fileId: String): Response<ApiEnvelope<List<ShareLinkDto>>> =
|
||||
Response.success(ApiEnvelope(data = emptyList()))
|
||||
|
||||
override suspend fun listPlacements(
|
||||
fileId: String,
|
||||
): Response<ApiEnvelope<List<PlacementDto>>> = Response.success(ApiEnvelope(data = emptyList()))
|
||||
}
|
||||
}
|
||||
|
||||
@@ -13,6 +13,7 @@ import com.kazier.mobile.data.remote.dto.LoginRequestDto
|
||||
import com.kazier.mobile.data.remote.dto.LoginResponseDto
|
||||
import com.kazier.mobile.data.remote.dto.OcrJobDto
|
||||
import com.kazier.mobile.data.remote.dto.OcrSubmitDto
|
||||
import com.kazier.mobile.data.remote.dto.PlacementDto
|
||||
import com.kazier.mobile.data.remote.dto.ResolvedUserDto
|
||||
import com.kazier.mobile.data.remote.dto.ResourcePermissionDto
|
||||
import com.kazier.mobile.data.remote.dto.ShareGrantDto
|
||||
@@ -87,9 +88,24 @@ class ShareManagementTest {
|
||||
assertEquals("NOT_FOUND", (ex as ApiException).code)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `listPlacements_retourne_serveur_puis_devices`() = runTest {
|
||||
val placements = listOf(
|
||||
PlacementDto("server", null, true, "2026-09-25T00:00:00Z"),
|
||||
PlacementDto("mobile", "d".repeat(32), false, "2026-09-25T01:00:00Z"),
|
||||
)
|
||||
val fake = SharesFake(placements = placements)
|
||||
val got = client(fake).listPlacements("f".repeat(32))
|
||||
assertEquals(2, got.size)
|
||||
assertEquals("server", got[0].locationType)
|
||||
assertTrue(got[0].hasBytes)
|
||||
assertEquals("d".repeat(32), got[1].deviceId)
|
||||
}
|
||||
|
||||
private class SharesFake(
|
||||
private val shares: List<ShareGrantDto> = emptyList(),
|
||||
private val links: List<ShareLinkDto> = emptyList(),
|
||||
private val placements: List<PlacementDto> = emptyList(),
|
||||
private val failShares: Boolean = false,
|
||||
private val failLink: Boolean = false,
|
||||
) : ApiService {
|
||||
@@ -158,6 +174,9 @@ class ShareManagementTest {
|
||||
override suspend fun listLinks(fileId: String): Response<ApiEnvelope<List<ShareLinkDto>>> =
|
||||
Response.success(ApiEnvelope(data = links))
|
||||
|
||||
override suspend fun listPlacements(fileId: String): Response<ApiEnvelope<List<PlacementDto>>> =
|
||||
Response.success(ApiEnvelope(data = placements))
|
||||
|
||||
private fun errBody(code: String) =
|
||||
"{\"error\":{\"code\":\"$code\",\"message\":\"x\"}}".toResponseBody("application/json".toMediaType())
|
||||
}
|
||||
|
||||
+20
-1
@@ -11,6 +11,9 @@ import com.kazier.mobile.data.local.dao.FileDao
|
||||
import com.kazier.mobile.data.local.entity.FileEntity
|
||||
import com.kazier.mobile.data.local.entity.FileStatus
|
||||
import com.kazier.mobile.data.preferences.DefaultRootStore
|
||||
import com.kazier.mobile.data.repository.OutboxRepository
|
||||
import com.kazier.mobile.domain.DeviceIdentity
|
||||
import com.kazier.mobile.domain.GenerateId
|
||||
import com.kazier.mobile.data.remote.ApiClient
|
||||
import com.kazier.mobile.data.remote.ApiException
|
||||
import com.kazier.mobile.data.remote.ApiService
|
||||
@@ -25,6 +28,7 @@ import com.kazier.mobile.data.remote.dto.LoginRequestDto
|
||||
import com.kazier.mobile.data.remote.dto.LoginResponseDto
|
||||
import com.kazier.mobile.data.remote.dto.OcrJobDto
|
||||
import com.kazier.mobile.data.remote.dto.OcrSubmitDto
|
||||
import com.kazier.mobile.data.remote.dto.PlacementDto
|
||||
import com.kazier.mobile.data.remote.dto.ResolvedUserDto
|
||||
import com.kazier.mobile.data.remote.dto.ResourcePermissionDto
|
||||
import com.kazier.mobile.data.remote.dto.ShareGrantDto
|
||||
@@ -73,9 +77,14 @@ class BytesUploadTest {
|
||||
.build()
|
||||
fileDao = db.fileDao()
|
||||
apiService = UploadFake()
|
||||
val generateId = GenerateId()
|
||||
val outbox = OutboxRepository(
|
||||
db.pendingOperationDao(), generateId,
|
||||
DeviceIdentity(db.userPreferenceDao(), generateId), moshi(),
|
||||
)
|
||||
repository = RemoteContentRepository(
|
||||
ApiClient(apiService, moshi()), fileDao, db.folderDao(),
|
||||
DefaultRootStore(context), context,
|
||||
DefaultRootStore(context), outbox, context,
|
||||
)
|
||||
}
|
||||
|
||||
@@ -94,6 +103,12 @@ class BytesUploadTest {
|
||||
assertEquals("ok-content", apiService.uploadedBytes)
|
||||
assertEquals(file.resourceId, apiService.uploadedResourceId)
|
||||
assertEquals(1, fileDao.getByResourceId(file.resourceId)?.bytesUploaded)
|
||||
// V2 placements : le succès reporte l'état frais (un nouvel
|
||||
// operation_id, payload {hasBytes:true}).
|
||||
val reported = db.pendingOperationDao().selectPending(10)
|
||||
assertEquals(1, reported.size)
|
||||
assertEquals("report_bytes", reported.single().operation)
|
||||
assertTrue(reported.single().payload.contains("\"hasBytes\":true"))
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -263,5 +278,9 @@ class BytesUploadTest {
|
||||
|
||||
override suspend fun listLinks(fileId: String): Response<ApiEnvelope<List<ShareLinkDto>>> =
|
||||
Response.success(ApiEnvelope(data = emptyList()))
|
||||
|
||||
override suspend fun listPlacements(
|
||||
fileId: String,
|
||||
): Response<ApiEnvelope<List<PlacementDto>>> = Response.success(ApiEnvelope(data = emptyList()))
|
||||
}
|
||||
}
|
||||
|
||||
+5
@@ -20,6 +20,7 @@ import com.kazier.mobile.data.remote.dto.ChangePasswordDto
|
||||
import com.kazier.mobile.data.remote.dto.DeviceRegistrationDto
|
||||
import com.kazier.mobile.data.remote.dto.IdResultDto
|
||||
import com.kazier.mobile.data.remote.dto.ShareLinkDto
|
||||
import com.kazier.mobile.data.remote.dto.PlacementDto
|
||||
import com.kazier.mobile.data.remote.dto.ShareGrantDto
|
||||
import com.kazier.mobile.data.remote.dto.FileDto
|
||||
import com.kazier.mobile.data.remote.dto.FileOcrDto
|
||||
@@ -392,4 +393,8 @@ private class FolderMergeApiService : ApiService {
|
||||
override suspend fun listLinks(
|
||||
fileId: String,
|
||||
): Response<ApiEnvelope<List<ShareLinkDto>>> = Response.success(ApiEnvelope(data = emptyList()))
|
||||
|
||||
override suspend fun listPlacements(
|
||||
fileId: String,
|
||||
): Response<ApiEnvelope<List<PlacementDto>>> = Response.success(ApiEnvelope(data = emptyList()))
|
||||
}
|
||||
+5
@@ -26,6 +26,7 @@ import com.kazier.mobile.data.remote.dto.ChangePasswordDto
|
||||
import com.kazier.mobile.data.remote.dto.DeviceRegistrationDto
|
||||
import com.kazier.mobile.data.remote.dto.IdResultDto
|
||||
import com.kazier.mobile.data.remote.dto.ShareLinkDto
|
||||
import com.kazier.mobile.data.remote.dto.PlacementDto
|
||||
import com.kazier.mobile.data.remote.dto.ShareGrantDto
|
||||
import com.kazier.mobile.data.remote.dto.FileDto
|
||||
import com.kazier.mobile.data.remote.dto.FileOcrDto
|
||||
@@ -481,4 +482,8 @@ private class MoveProtectionApiService : ApiService {
|
||||
override suspend fun listLinks(
|
||||
fileId: String,
|
||||
): Response<ApiEnvelope<List<ShareLinkDto>>> = Response.success(ApiEnvelope(data = emptyList()))
|
||||
|
||||
override suspend fun listPlacements(
|
||||
fileId: String,
|
||||
): Response<ApiEnvelope<List<PlacementDto>>> = Response.success(ApiEnvelope(data = emptyList()))
|
||||
}
|
||||
@@ -18,6 +18,7 @@ import com.kazier.mobile.data.remote.dto.ChangePasswordDto
|
||||
import com.kazier.mobile.data.remote.dto.DeviceRegistrationDto
|
||||
import com.kazier.mobile.data.remote.dto.IdResultDto
|
||||
import com.kazier.mobile.data.remote.dto.ShareLinkDto
|
||||
import com.kazier.mobile.data.remote.dto.PlacementDto
|
||||
import com.kazier.mobile.data.remote.dto.ShareGrantDto
|
||||
import com.kazier.mobile.data.remote.dto.FileDto
|
||||
import com.kazier.mobile.data.remote.dto.FileOcrDto
|
||||
@@ -399,4 +400,8 @@ private class OcrApiServiceFake : ApiService {
|
||||
override suspend fun listLinks(
|
||||
fileId: String,
|
||||
): Response<ApiEnvelope<List<ShareLinkDto>>> = Response.success(ApiEnvelope(data = emptyList()))
|
||||
|
||||
override suspend fun listPlacements(
|
||||
fileId: String,
|
||||
): Response<ApiEnvelope<List<PlacementDto>>> = Response.success(ApiEnvelope(data = emptyList()))
|
||||
}
|
||||
+18
-1
@@ -11,6 +11,9 @@ import com.kazier.mobile.data.local.entity.FileEntity
|
||||
import com.kazier.mobile.data.local.entity.FileStatus
|
||||
import com.kazier.mobile.data.local.entity.FolderEntity
|
||||
import com.kazier.mobile.data.preferences.DefaultRootStore
|
||||
import com.kazier.mobile.data.repository.OutboxRepository
|
||||
import com.kazier.mobile.domain.DeviceIdentity
|
||||
import com.kazier.mobile.domain.GenerateId
|
||||
import com.kazier.mobile.data.remote.ApiClient
|
||||
import com.kazier.mobile.data.remote.ApiService
|
||||
import com.kazier.mobile.data.remote.dto.ApiEnvelope
|
||||
@@ -24,6 +27,7 @@ import com.kazier.mobile.data.remote.dto.LoginRequestDto
|
||||
import com.kazier.mobile.data.remote.dto.LoginResponseDto
|
||||
import com.kazier.mobile.data.remote.dto.OcrJobDto
|
||||
import com.kazier.mobile.data.remote.dto.OcrSubmitDto
|
||||
import com.kazier.mobile.data.remote.dto.PlacementDto
|
||||
import com.kazier.mobile.data.remote.dto.ResolvedUserDto
|
||||
import com.kazier.mobile.data.remote.dto.ResourcePermissionDto
|
||||
import com.kazier.mobile.data.remote.dto.ShareGrantDto
|
||||
@@ -76,8 +80,13 @@ class OfflineDownloadTest {
|
||||
fake = DownloadFake()
|
||||
rootStore = DefaultRootStore(context)
|
||||
val moshi = Moshi.Builder().add(KotlinJsonAdapterFactory()).build()
|
||||
val generateId = GenerateId()
|
||||
val outbox = OutboxRepository(
|
||||
db.pendingOperationDao(), generateId,
|
||||
DeviceIdentity(db.userPreferenceDao(), generateId), moshi,
|
||||
)
|
||||
repository = RemoteContentRepository(
|
||||
ApiClient(fake, moshi), fileDao, db.folderDao(), rootStore, context,
|
||||
ApiClient(fake, moshi), fileDao, db.folderDao(), rootStore, outbox, context,
|
||||
)
|
||||
}
|
||||
|
||||
@@ -102,6 +111,10 @@ class OfflineDownloadTest {
|
||||
assertTrue(stored.processed)
|
||||
assertEquals(false, stored.wantedOffline)
|
||||
assertEquals(1, stored.exists)
|
||||
// V2 placements : le rattachement reporte l'état frais.
|
||||
val reported = db.pendingOperationDao().selectPending(10)
|
||||
assertEquals(1, reported.size)
|
||||
assertEquals("report_bytes", reported.single().operation)
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -279,5 +292,9 @@ class OfflineDownloadTest {
|
||||
|
||||
override suspend fun listLinks(fileId: String): Response<ApiEnvelope<List<ShareLinkDto>>> =
|
||||
Response.success(ApiEnvelope(data = emptyList()))
|
||||
|
||||
override suspend fun listPlacements(
|
||||
fileId: String,
|
||||
): Response<ApiEnvelope<List<PlacementDto>>> = Response.success(ApiEnvelope(data = emptyList()))
|
||||
}
|
||||
}
|
||||
|
||||
@@ -25,6 +25,7 @@ import com.kazier.mobile.data.remote.dto.LoginRequestDto
|
||||
import com.kazier.mobile.data.remote.dto.LoginResponseDto
|
||||
import com.kazier.mobile.data.remote.dto.OcrJobDto
|
||||
import com.kazier.mobile.data.remote.dto.OcrSubmitDto
|
||||
import com.kazier.mobile.data.remote.dto.PlacementDto
|
||||
import com.kazier.mobile.data.remote.dto.ResolvedUserDto
|
||||
import com.kazier.mobile.data.remote.dto.ResourcePermissionDto
|
||||
import com.kazier.mobile.data.remote.dto.ShareLinkDto
|
||||
@@ -248,4 +249,8 @@ private class RefreshVsMoveApiService : ApiService {
|
||||
override suspend fun listLinks(
|
||||
fileId: String,
|
||||
): Response<ApiEnvelope<List<ShareLinkDto>>> = Response.success(ApiEnvelope(data = emptyList()))
|
||||
|
||||
override suspend fun listPlacements(
|
||||
fileId: String,
|
||||
): Response<ApiEnvelope<List<PlacementDto>>> = Response.success(ApiEnvelope(data = emptyList()))
|
||||
}
|
||||
|
||||
+5
@@ -19,6 +19,7 @@ import com.kazier.mobile.data.remote.dto.ChangePasswordDto
|
||||
import com.kazier.mobile.data.remote.dto.DeviceRegistrationDto
|
||||
import com.kazier.mobile.data.remote.dto.IdResultDto
|
||||
import com.kazier.mobile.data.remote.dto.ShareLinkDto
|
||||
import com.kazier.mobile.data.remote.dto.PlacementDto
|
||||
import com.kazier.mobile.data.remote.dto.ShareGrantDto
|
||||
import com.kazier.mobile.data.remote.dto.FileDto
|
||||
import com.kazier.mobile.data.remote.dto.FileOcrDto
|
||||
@@ -502,4 +503,8 @@ private class FakeApiService : ApiService {
|
||||
override suspend fun listLinks(
|
||||
fileId: String,
|
||||
): Response<ApiEnvelope<List<ShareLinkDto>>> = Response.success(ApiEnvelope(data = emptyList()))
|
||||
|
||||
override suspend fun listPlacements(
|
||||
fileId: String,
|
||||
): Response<ApiEnvelope<List<PlacementDto>>> = Response.success(ApiEnvelope(data = emptyList()))
|
||||
}
|
||||
+6
-2
@@ -103,8 +103,11 @@ class ReleaseLocalCopyTest {
|
||||
assertEquals("ligne toujours visible", 1, stored.exists)
|
||||
// L'intouchable n'a même pas été tenté en SAF.
|
||||
assertEquals("content://x/3", db.fileDao().getByResourceId(unsafe.resourceId)!!.uri)
|
||||
// Aucune op outbox (purge purement locale).
|
||||
assertEquals(0, db.pendingOperationDao().countPending())
|
||||
// Seul le report V2 (hint, pas une mutation) est journalisé.
|
||||
val ops = db.pendingOperationDao().selectPending(10)
|
||||
assertEquals(1, ops.size)
|
||||
assertEquals("report_bytes", ops.single().operation)
|
||||
assertTrue(ops.single().payload.contains("\"hasBytes\":false"))
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -158,5 +161,6 @@ class ReleaseLocalCopyTest {
|
||||
override suspend fun downloadContent(fileId: String): retrofit2.Response<okhttp3.ResponseBody> = TODO()
|
||||
override suspend fun listShares(fileId: String): retrofit2.Response<com.kazier.mobile.data.remote.dto.ApiEnvelope<List<com.kazier.mobile.data.remote.dto.ShareGrantDto>>> = TODO()
|
||||
override suspend fun listLinks(fileId: String): retrofit2.Response<com.kazier.mobile.data.remote.dto.ApiEnvelope<List<com.kazier.mobile.data.remote.dto.ShareLinkDto>>> = TODO()
|
||||
override suspend fun listPlacements(fileId: String): retrofit2.Response<com.kazier.mobile.data.remote.dto.ApiEnvelope<List<com.kazier.mobile.data.remote.dto.PlacementDto>>> = TODO()
|
||||
}
|
||||
}
|
||||
|
||||
+38
-1
@@ -37,6 +37,7 @@ import com.kazier.mobile.data.remote.dto.LoginRequestDto
|
||||
import com.kazier.mobile.data.remote.dto.LoginResponseDto
|
||||
import com.kazier.mobile.data.remote.dto.OcrJobDto
|
||||
import com.kazier.mobile.data.remote.dto.OcrSubmitDto
|
||||
import com.kazier.mobile.data.remote.dto.PlacementDto
|
||||
import com.kazier.mobile.data.remote.dto.ResolvedUserDto
|
||||
import com.kazier.mobile.data.remote.dto.ResourcePermissionDto
|
||||
import com.kazier.mobile.data.remote.dto.ShareLinkDto
|
||||
@@ -214,8 +215,40 @@ class OutboxSyncWorkerTest {
|
||||
assertEquals("le voisin est intact", PendingOpStatus.PENDING, byOp[opId(3)]!!.status)
|
||||
}
|
||||
|
||||
// --- C7 : gardes ----------------------------------------------------------
|
||||
// --- V2 placements : hint périmé ne bloque pas la file -------------------
|
||||
|
||||
@Test
|
||||
fun echec_report_bytes_deadletter_sans_bloquer_la_suite() = runTest {
|
||||
insertOp(
|
||||
operationId = opId(1), resourceId = resId(1), resourceType = "file",
|
||||
operation = PendingOperationType.REPORT_BYTES,
|
||||
payload = """{"hasBytes":true}""",
|
||||
)
|
||||
insertOp(operationId = opId(2), resourceId = resId(2))
|
||||
var calls = 0
|
||||
fake.syncOpsHandler = { req ->
|
||||
calls++
|
||||
if (calls == 1) {
|
||||
assertEquals(2, req.operations.size)
|
||||
assertEquals("report_bytes", req.operations[0].operation)
|
||||
opsResult(applied = 0, failed = SyncFailedDto(opId(1), "NOT_FOUND", "invisible"))
|
||||
} else {
|
||||
assertEquals(listOf(opId(2)), req.operations.map { it.operationId })
|
||||
opsResult(applied = 1, failed = null)
|
||||
}
|
||||
}
|
||||
|
||||
val result = worker.doWork()
|
||||
|
||||
assertTrue(result is ListenableWorker.Result.Success)
|
||||
assertEquals("batch reparti sans le hint mort", 2, calls)
|
||||
val byOp = opsDao.observeRecent(100).first().associateBy { it.operationId }
|
||||
assertEquals(PendingOpStatus.FAILED, byOp[opId(1)]!!.status)
|
||||
assertEquals(PendingOpStatus.SYNCED, byOp[opId(2)]!!.status)
|
||||
assertEquals(0, opsDao.countPending())
|
||||
}
|
||||
|
||||
// --- C7 : gardes ----------------------------------------------------------
|
||||
@Test
|
||||
fun failed_inconnu_pas_de_boucle() = runTest {
|
||||
insertOp(opId(1))
|
||||
@@ -462,5 +495,9 @@ class OutboxSyncWorkerTest {
|
||||
override suspend fun listLinks(
|
||||
fileId: String,
|
||||
): Response<ApiEnvelope<List<ShareLinkDto>>> = Response.success(ApiEnvelope(data = emptyList()))
|
||||
|
||||
override suspend fun listPlacements(
|
||||
fileId: String,
|
||||
): Response<ApiEnvelope<List<PlacementDto>>> = Response.success(ApiEnvelope(data = emptyList()))
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user