Skip to content
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.

Sign up for GitHub

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

refactor: remove unused legacy ClientDTO values (WPB-5623) #2254

Merged
merged 2 commits into from
Nov 23, 2023
Merged

refactor: remove unused legacy ClientDTO values (WPB-5623) #2254

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b59b91
refactor: remove unused legacy ClientDTO values
MohamadJaara Nov 23, 2023
713a283
adjust tests
MohamadJaara Nov 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .../src/commonMain/kotlin/com/wire/kalium/network/api/base/authenticated/client/ClientDTO.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

package com.wire.kalium.network.api.base.authenticated.client

import com.wire.kalium.network.api.base.model.LocationResponse
import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable

Expand All @@ -27,7 +26,6 @@ data class ClientDTO(
@SerialName("cookie") val cookie: String?,
@SerialName("time") val registrationTime: String, // yyyy-mm-ddThh:MM:ss.qqq
@SerialName("last_active") val lastActive: String?, // yyyy-mm-ddThh:MM:ss.qqq
@SerialName("location") val location: LocationResponse?,
@SerialName("model") val model: String?,
@SerialName("id") val clientId: String,
@SerialName("type") val type: ClientTypeDTO,
Expand Down
28 changes: 0 additions & 28 deletions network/src/commonMain/kotlin/com/wire/kalium/network/api/base/model/LocationResponse.kt
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions network/src/commonTest/kotlin/com/wire/kalium/model/ClientResponseJson.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import com.wire.kalium.network.api.base.authenticated.client.ClientCapabilityDTO
import com.wire.kalium.network.api.base.authenticated.client.ClientDTO
import com.wire.kalium.network.api.base.authenticated.client.ClientTypeDTO
import com.wire.kalium.network.api.base.authenticated.client.DeviceTypeDTO
import com.wire.kalium.network.api.base.model.LocationResponse

object ClientResponseJson {
private val jsonProvider = { serializable: ClientDTO ->
Expand All @@ -37,10 +36,6 @@ object ClientResponseJson {
| "class": "${serializable.deviceType}",
| "label": "${serializable.label}",
| "cookie": "${serializable.cookie}",
| "location": {
| "lat": ${serializable.location!!.latitude},
| "lon": ${serializable.location!!.longitude}
| },
| "model": "${serializable.model}",
| "capabilities": {
| "capabilities": [
Expand All @@ -58,7 +53,6 @@ object ClientResponseJson {
deviceType = DeviceTypeDTO.Phone,
registrationTime = "2021-05-12T10:52:02.671Z",
lastActive = "2021-05-12T10:52:02.671Z",
location = LocationResponse(latitude = "1.2345", longitude = "6.7890"),
label = "label",
cookie = "sldkfmdeklmwldwlek23kl44mntiuepfojfndkjd",
capabilities = Capabilities(listOf(ClientCapabilityDTO.LegalHoldImplicitConsent)),
Expand Down
3 changes: 0 additions & 3 deletions network/src/commonTest/kotlin/com/wire/kalium/model/NotificationEventsResponseJson.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import com.wire.kalium.model.conversation.ConversationResponseJson
import com.wire.kalium.network.api.base.authenticated.client.ClientDTO
import com.wire.kalium.network.api.base.authenticated.client.ClientTypeDTO
import com.wire.kalium.network.api.base.authenticated.client.DeviceTypeDTO
import com.wire.kalium.network.api.base.authenticated.conversation.ConvProtocol
import com.wire.kalium.network.api.base.authenticated.featureConfigs.AppLockConfigDTO
import com.wire.kalium.network.api.base.authenticated.featureConfigs.ClassifiedDomainsConfigDTO
import com.wire.kalium.network.api.base.authenticated.featureConfigs.FeatureConfigData
Expand All @@ -38,7 +37,6 @@ import com.wire.kalium.network.api.base.authenticated.notification.EventContentD
import com.wire.kalium.network.api.base.authenticated.notification.EventResponse
import com.wire.kalium.network.api.base.authenticated.notification.NotificationResponse
import com.wire.kalium.network.api.base.model.ConversationId
import com.wire.kalium.network.api.base.model.LocationResponse
import com.wire.kalium.network.api.base.model.QualifiedID
import com.wire.kalium.network.api.base.model.SupportedProtocolDTO
import kotlinx.serialization.InternalSerializationApi
Expand Down Expand Up @@ -73,7 +71,6 @@ object NotificationEventsResponseJson {
ClientDTO(
cookie = null,
clientId = "id",
location = LocationResponse("23.2", "43.2"),
registrationTime = "2022-02-15T12:54:30Z",
lastActive = "2022-02-15T12:54:30Z",
model = "Firefox (Temporary)",
Expand Down
6 changes: 0 additions & 6 deletions tango-tests/src/integrationTest/kotlin/util/ClientResponseJson.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import com.wire.kalium.network.api.base.authenticated.client.ClientCapabilityDTO
import com.wire.kalium.network.api.base.authenticated.client.ClientDTO
import com.wire.kalium.network.api.base.authenticated.client.ClientTypeDTO
import com.wire.kalium.network.api.base.authenticated.client.DeviceTypeDTO
import com.wire.kalium.network.api.base.model.LocationResponse

object ClientResponseJson {
private val jsonProvider = { serializable: ClientDTO ->
Expand All @@ -36,10 +35,6 @@ object ClientResponseJson {
| "class": "${serializable.deviceType}",
| "label": "${serializable.label}",
| "cookie": "${serializable.cookie}",
| "location": {
| "lat": ${serializable.location!!.latitude},
| "lon": ${serializable.location!!.longitude}
| },
| "model": "${serializable.model}",
| "capabilities": {
| "capabilities": [
Expand All @@ -57,7 +52,6 @@ object ClientResponseJson {
deviceType = DeviceTypeDTO.Phone,
registrationTime = "2023-05-12T10:52:02.671Z",
lastActive = "2023-05-12T10:52:02.671Z",
location = LocationResponse(latitude = "1.2345", longitude = "6.7890"),
label = "label",
cookie = "sldkfmdeklmwldwlek23kl44mntiuepfojfndkjd",
capabilities = Capabilities(listOf(ClientCapabilityDTO.LegalHoldImplicitConsent)),
Expand Down
6 changes: 0 additions & 6 deletions tango-tests/src/integrationTest/kotlin/util/ListOfClientsResponseJson.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import com.wire.kalium.network.api.base.authenticated.client.ClientCapabilityDTO
import com.wire.kalium.network.api.base.authenticated.client.ClientDTO
import com.wire.kalium.network.api.base.authenticated.client.ClientTypeDTO
import com.wire.kalium.network.api.base.authenticated.client.DeviceTypeDTO
import com.wire.kalium.network.api.base.model.LocationResponse

object ListOfClientsResponseJson {
private val jsonProvider = { serializable: ClientDTO ->
Expand All @@ -36,10 +35,6 @@ object ListOfClientsResponseJson {
| "class": "${serializable.deviceType}",
| "label": "${serializable.label}",
| "cookie": "${serializable.cookie}",
| "location": {
| "lat": ${serializable.location!!.latitude},
| "lon": ${serializable.location!!.longitude}
| },
| "model": "${serializable.model}",
| "capabilities": {
| "capabilities": [
Expand All @@ -57,7 +52,6 @@ object ListOfClientsResponseJson {
deviceType = DeviceTypeDTO.Phone,
registrationTime = "2023-05-12T10:52:02.671Z",
lastActive = "2023-05-12T10:52:02.671Z",
location = LocationResponse(latitude = "1.2345", longitude = "6.7890"),
label = "label",
cookie = "sldkfmdeklmwldwlek23kl44mntiuepfojfndkjd",
capabilities = Capabilities(listOf(ClientCapabilityDTO.LegalHoldImplicitConsent)),
Expand Down
Loading