From 4676f4bf8c3c31f1e3d6a2efe1bcf4f0f50f555d Mon Sep 17 00:00:00 2001 From: Patrick Honkonen <1883101+SaintPatrck@users.noreply.github.com> Date: Thu, 3 Apr 2025 14:22:53 -0400 Subject: [PATCH] [PM-19841] Migrate Event API and models to network module (#4976) --- .../data/platform/datasource/disk/EventDiskSource.kt | 2 +- .../data/platform/datasource/disk/EventDiskSourceImpl.kt | 4 ++-- .../platform/datasource/network/service/EventService.kt | 2 +- .../platform/datasource/network/service/EventServiceImpl.kt | 4 ++-- .../platform/manager/event/OrganizationEventManagerImpl.kt | 2 +- .../data/platform/manager/model/OrganizationEvent.kt | 2 ++ .../data/platform/datasource/disk/EventDiskSourceTest.kt | 4 ++-- .../platform/datasource/network/service/EventServiceTest.kt | 6 +++--- .../platform/manager/event/OrganizationEventManagerTest.kt | 4 ++-- .../src/main/kotlin/com/bitwarden}/network/api/EventApi.kt | 4 ++-- .../com/bitwarden}/network/model/OrganizationEventJson.kt | 3 +-- .../com/bitwarden/network}/model/OrganizationEventType.kt | 2 +- 12 files changed, 20 insertions(+), 19 deletions(-) rename {app/src/main/java/com/x8bit/bitwarden/data/platform/datasource => network/src/main/kotlin/com/bitwarden}/network/api/EventApi.kt (69%) rename {app/src/main/java/com/x8bit/bitwarden/data/platform/datasource => network/src/main/kotlin/com/bitwarden}/network/model/OrganizationEventJson.kt (76%) rename {app/src/main/java/com/x8bit/bitwarden/data/platform/manager => network/src/main/kotlin/com/bitwarden/network}/model/OrganizationEventType.kt (97%) diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/EventDiskSource.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/EventDiskSource.kt index 6a8a79790d..8fedfb722e 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/EventDiskSource.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/EventDiskSource.kt @@ -1,6 +1,6 @@ package com.x8bit.bitwarden.data.platform.datasource.disk -import com.x8bit.bitwarden.data.platform.datasource.network.model.OrganizationEventJson +import com.bitwarden.network.model.OrganizationEventJson /** * Primary access point for disk information related to event data. diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/EventDiskSourceImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/EventDiskSourceImpl.kt index dd7319e0e0..1debb07581 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/EventDiskSourceImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/EventDiskSourceImpl.kt @@ -1,10 +1,10 @@ package com.x8bit.bitwarden.data.platform.datasource.disk +import com.bitwarden.network.model.OrganizationEventJson +import com.bitwarden.network.model.OrganizationEventType import com.x8bit.bitwarden.data.platform.datasource.disk.dao.OrganizationEventDao import com.x8bit.bitwarden.data.platform.datasource.disk.entity.OrganizationEventEntity -import com.x8bit.bitwarden.data.platform.datasource.network.model.OrganizationEventJson import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager -import com.x8bit.bitwarden.data.platform.manager.model.OrganizationEventType import kotlinx.coroutines.withContext import kotlinx.serialization.json.Json diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/service/EventService.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/service/EventService.kt index c771f9e5b5..06dedda29c 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/service/EventService.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/service/EventService.kt @@ -1,6 +1,6 @@ package com.x8bit.bitwarden.data.platform.datasource.network.service -import com.x8bit.bitwarden.data.platform.datasource.network.model.OrganizationEventJson +import com.bitwarden.network.model.OrganizationEventJson /** * Provides an API for submitting events. diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/service/EventServiceImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/service/EventServiceImpl.kt index 7081a5f5f0..fde5f715cf 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/service/EventServiceImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/service/EventServiceImpl.kt @@ -1,8 +1,8 @@ package com.x8bit.bitwarden.data.platform.datasource.network.service +import com.bitwarden.network.api.EventApi +import com.bitwarden.network.model.OrganizationEventJson import com.bitwarden.network.util.toResult -import com.x8bit.bitwarden.data.platform.datasource.network.api.EventApi -import com.x8bit.bitwarden.data.platform.datasource.network.model.OrganizationEventJson /** * The default implementation of the [EventService]. diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/event/OrganizationEventManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/event/OrganizationEventManagerImpl.kt index 968081c599..475580d5aa 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/event/OrganizationEventManagerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/event/OrganizationEventManagerImpl.kt @@ -3,10 +3,10 @@ package com.x8bit.bitwarden.data.platform.manager.event import androidx.lifecycle.DefaultLifecycleObserver import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.ProcessLifecycleOwner +import com.bitwarden.network.model.OrganizationEventJson import com.x8bit.bitwarden.data.auth.repository.AuthRepository import com.x8bit.bitwarden.data.auth.repository.model.AuthState import com.x8bit.bitwarden.data.platform.datasource.disk.EventDiskSource -import com.x8bit.bitwarden.data.platform.datasource.network.model.OrganizationEventJson import com.x8bit.bitwarden.data.platform.datasource.network.service.EventService import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager import com.x8bit.bitwarden.data.platform.manager.model.OrganizationEvent diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/model/OrganizationEvent.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/model/OrganizationEvent.kt index 73cb76b8d1..fc0a29da3a 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/model/OrganizationEvent.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/model/OrganizationEvent.kt @@ -1,5 +1,7 @@ package com.x8bit.bitwarden.data.platform.manager.model +import com.bitwarden.network.model.OrganizationEventType + /** * A representation of events used for organization tracking. */ diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/disk/EventDiskSourceTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/disk/EventDiskSourceTest.kt index 8d6547f9e5..9bf2205d39 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/disk/EventDiskSourceTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/disk/EventDiskSourceTest.kt @@ -1,11 +1,11 @@ package com.x8bit.bitwarden.data.platform.datasource.disk import com.bitwarden.core.di.CoreModule +import com.bitwarden.network.model.OrganizationEventJson +import com.bitwarden.network.model.OrganizationEventType import com.x8bit.bitwarden.data.platform.base.FakeDispatcherManager import com.x8bit.bitwarden.data.platform.datasource.disk.dao.FakeOrganizationEventDao import com.x8bit.bitwarden.data.platform.datasource.disk.entity.OrganizationEventEntity -import com.x8bit.bitwarden.data.platform.datasource.network.model.OrganizationEventJson -import com.x8bit.bitwarden.data.platform.manager.model.OrganizationEventType import kotlinx.coroutines.test.runTest import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertFalse diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/network/service/EventServiceTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/network/service/EventServiceTest.kt index 241db59df0..69ec5fbf6b 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/network/service/EventServiceTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/network/service/EventServiceTest.kt @@ -1,9 +1,9 @@ package com.x8bit.bitwarden.data.platform.datasource.network.service +import com.bitwarden.network.api.EventApi import com.bitwarden.network.base.BaseServiceTest -import com.x8bit.bitwarden.data.platform.datasource.network.api.EventApi -import com.x8bit.bitwarden.data.platform.datasource.network.model.OrganizationEventJson -import com.x8bit.bitwarden.data.platform.manager.model.OrganizationEventType +import com.bitwarden.network.model.OrganizationEventJson +import com.bitwarden.network.model.OrganizationEventType import kotlinx.coroutines.test.runTest import okhttp3.mockwebserver.MockResponse import org.junit.jupiter.api.Assertions.assertEquals diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/event/OrganizationEventManagerTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/event/OrganizationEventManagerTest.kt index 4d4dfd5f5c..2408f08dca 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/event/OrganizationEventManagerTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/event/OrganizationEventManagerTest.kt @@ -2,15 +2,15 @@ package com.x8bit.bitwarden.data.platform.manager.event import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.core.data.util.asSuccess +import com.bitwarden.network.model.OrganizationEventJson +import com.bitwarden.network.model.OrganizationEventType import com.bitwarden.vault.CipherView import com.x8bit.bitwarden.data.auth.repository.AuthRepository import com.x8bit.bitwarden.data.auth.repository.model.AuthState import com.x8bit.bitwarden.data.platform.base.FakeDispatcherManager import com.x8bit.bitwarden.data.platform.datasource.disk.EventDiskSource -import com.x8bit.bitwarden.data.platform.datasource.network.model.OrganizationEventJson import com.x8bit.bitwarden.data.platform.datasource.network.service.EventService import com.x8bit.bitwarden.data.platform.manager.model.OrganizationEvent -import com.x8bit.bitwarden.data.platform.manager.model.OrganizationEventType import com.x8bit.bitwarden.data.util.FakeLifecycleOwner import com.x8bit.bitwarden.data.util.advanceTimeByAndRunCurrent import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockOrganization diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/api/EventApi.kt b/network/src/main/kotlin/com/bitwarden/network/api/EventApi.kt similarity index 69% rename from app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/api/EventApi.kt rename to network/src/main/kotlin/com/bitwarden/network/api/EventApi.kt index c62bdeabc9..d769761721 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/api/EventApi.kt +++ b/network/src/main/kotlin/com/bitwarden/network/api/EventApi.kt @@ -1,7 +1,7 @@ -package com.x8bit.bitwarden.data.platform.datasource.network.api +package com.bitwarden.network.api import com.bitwarden.network.model.NetworkResult -import com.x8bit.bitwarden.data.platform.datasource.network.model.OrganizationEventJson +import com.bitwarden.network.model.OrganizationEventJson import retrofit2.http.Body import retrofit2.http.POST diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/model/OrganizationEventJson.kt b/network/src/main/kotlin/com/bitwarden/network/model/OrganizationEventJson.kt similarity index 76% rename from app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/model/OrganizationEventJson.kt rename to network/src/main/kotlin/com/bitwarden/network/model/OrganizationEventJson.kt index 87ae767ca0..6e4ae74907 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/model/OrganizationEventJson.kt +++ b/network/src/main/kotlin/com/bitwarden/network/model/OrganizationEventJson.kt @@ -1,6 +1,5 @@ -package com.x8bit.bitwarden.data.platform.datasource.network.model +package com.bitwarden.network.model -import com.x8bit.bitwarden.data.platform.manager.model.OrganizationEventType import kotlinx.serialization.Contextual import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/model/OrganizationEventType.kt b/network/src/main/kotlin/com/bitwarden/network/model/OrganizationEventType.kt similarity index 97% rename from app/src/main/java/com/x8bit/bitwarden/data/platform/manager/model/OrganizationEventType.kt rename to network/src/main/kotlin/com/bitwarden/network/model/OrganizationEventType.kt index f61cc15c0c..91bbece85e 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/model/OrganizationEventType.kt +++ b/network/src/main/kotlin/com/bitwarden/network/model/OrganizationEventType.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.data.platform.manager.model +package com.bitwarden.network.model import androidx.annotation.Keep import com.bitwarden.core.data.serializer.BaseEnumeratedIntSerializer