F3.1 Android: agregar familias y merge de Inventario
This commit is contained in:
@@ -214,11 +214,24 @@ data class FieldAttributeDefinition(
|
|||||||
val sortOrder: Int = 0,
|
val sortOrder: Int = 0,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
data class FieldInventoryFamily(
|
||||||
|
val id: String,
|
||||||
|
val code: String,
|
||||||
|
val name: String,
|
||||||
|
val level: String,
|
||||||
|
val informationLabels: List<String> = emptyList(),
|
||||||
|
val sourceReference: String? = null,
|
||||||
|
val isOther: Boolean = false,
|
||||||
|
)
|
||||||
|
|
||||||
data class FieldType(
|
data class FieldType(
|
||||||
val id: String,
|
val id: String,
|
||||||
val code: String,
|
val code: String,
|
||||||
val name: String,
|
val name: String,
|
||||||
val description: String? = null,
|
val description: String? = null,
|
||||||
|
val structuralKind: String? = null,
|
||||||
|
val families: List<FieldInventoryFamily> = emptyList(),
|
||||||
|
val familyRequired: Boolean = false,
|
||||||
val attributes: List<FieldAttributeDefinition> = emptyList(),
|
val attributes: List<FieldAttributeDefinition> = emptyList(),
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -246,6 +259,7 @@ data class FieldAssetDetail(
|
|||||||
data class CreateFieldInventoryRequest(
|
data class CreateFieldInventoryRequest(
|
||||||
val typeId: String,
|
val typeId: String,
|
||||||
val parentId: String? = null,
|
val parentId: String? = null,
|
||||||
|
val familyId: String? = null,
|
||||||
val code: String? = null,
|
val code: String? = null,
|
||||||
val name: String,
|
val name: String,
|
||||||
val commonName: String? = null,
|
val commonName: String? = null,
|
||||||
@@ -263,6 +277,19 @@ data class FieldPhotoResponse(
|
|||||||
val capture: CaptureStatus,
|
val capture: CaptureStatus,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
data class MergeFieldInventoryRequest(
|
||||||
|
val canonicalAssetId: String,
|
||||||
|
val reason: String,
|
||||||
|
)
|
||||||
|
|
||||||
|
data class FieldInventoryMergeResult(
|
||||||
|
val source: AssetSummary,
|
||||||
|
val canonical: AssetSummary,
|
||||||
|
val sourceVersionNumber: Int,
|
||||||
|
val reparentedChildIds: List<String> = emptyList(),
|
||||||
|
val historyPolicy: String,
|
||||||
|
)
|
||||||
|
|
||||||
interface DhApi {
|
interface DhApi {
|
||||||
@POST("auth/mobile/login")
|
@POST("auth/mobile/login")
|
||||||
suspend fun login(@Body request: LoginRequest): MobileSessionResponse
|
suspend fun login(@Body request: LoginRequest): MobileSessionResponse
|
||||||
@@ -322,6 +349,14 @@ interface DhApi {
|
|||||||
@Body request: CreateFieldInventoryRequest,
|
@Body request: CreateFieldInventoryRequest,
|
||||||
): FieldAssetDetail
|
): FieldAssetDetail
|
||||||
|
|
||||||
|
@POST("inspection-visits/{visitId}/field-inventory/{assetId}/merge")
|
||||||
|
suspend fun mergeFieldAsset(
|
||||||
|
@Header("Authorization") authorization: String,
|
||||||
|
@Path("visitId") visitId: String,
|
||||||
|
@Path("assetId") assetId: String,
|
||||||
|
@Body request: MergeFieldInventoryRequest,
|
||||||
|
): FieldInventoryMergeResult
|
||||||
|
|
||||||
@Multipart
|
@Multipart
|
||||||
@POST("inspection-visits/{visitId}/field-inventory/{assetId}/photos")
|
@POST("inspection-visits/{visitId}/field-inventory/{assetId}/photos")
|
||||||
suspend fun uploadFieldPhoto(
|
suspend fun uploadFieldPhoto(
|
||||||
@@ -465,6 +500,20 @@ class DhRepository(context: Context) {
|
|||||||
api.createFieldAsset("Bearer ${session.accessToken}", visitId, request)
|
api.createFieldAsset("Bearer ${session.accessToken}", visitId, request)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
suspend fun mergeFieldAsset(
|
||||||
|
visitId: String,
|
||||||
|
assetId: String,
|
||||||
|
canonicalAssetId: String,
|
||||||
|
reason: String,
|
||||||
|
): FieldInventoryMergeResult = authorized { session ->
|
||||||
|
api.mergeFieldAsset(
|
||||||
|
"Bearer ${session.accessToken}",
|
||||||
|
visitId,
|
||||||
|
assetId,
|
||||||
|
MergeFieldInventoryRequest(canonicalAssetId, reason.trim()),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
suspend fun uploadFieldPhoto(
|
suspend fun uploadFieldPhoto(
|
||||||
visitId: String,
|
visitId: String,
|
||||||
assetId: String,
|
assetId: String,
|
||||||
|
|||||||
Reference in New Issue
Block a user