Adding shared octanegg module.

.github/workflows/lint_checks.yml

@@ -1,6 +1,6 @@
 name: Lint Checks
 
-on: push
+on: pull_request
 
 jobs:
   lint-checks:

.github/workflows/build.yml → .github/workflows/unit_tests.yml

@@ -1,9 +1,9 @@
-name: Build
+name: Unit Tests
 
-on: push
+on: pull_request
 
 jobs:
-  build:
+  unit-tests:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
@@ -19,4 +19,4 @@ jobs:
         run: echo $LOCAL_PROPERTIES > ./local.properties
 
       - name: Build Project
-        run: ./gradlew assemble
+        run: ./gradlew build

.gitignore

@@ -18,5 +18,6 @@ local.properties
 /feature-eventsummarylist/build/
 /team-api/build/
 /team-implementation/build/
+/octanegg/build/
 /buildSrc/build/
 PocketLeagueiOS/PocketLeagueiOS.xcodeproj/project.xcworkspace/xcuserdata/amcneilly.xcuserdatad/UserInterfaceState.xcuserstate

app/build.gradle.kts

@@ -81,22 +81,6 @@ android {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
         }
     }
-
-    testOptions {
-        unitTests.all {
-            it.extensions.configure(kotlinx.kover.api.KoverTaskExtension::class) {
-                isEnabled = true
-                excludes = listOf(
-                    "dagger.hilt.internal.aggregatedroot.codegen.*",
-                    "hilt_aggregated_deps.*",
-                    ".*ComposableSingletons.*",
-                    ".*Hilt.*",
-                    ".*BuildConfig.*",
-                    ".*_Factory.*",
-                )
-            }
-        }
-    }
 }
 
 dependencies {

build.gradle.kts

@@ -15,7 +15,6 @@ buildscript {
         classpath("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.19.0")
         classpath("com.github.ben-manes:gradle-versions-plugin:0.29.0")
         classpath("com.google.dagger:hilt-android-gradle-plugin:${Versions.hilt}")
-        classpath("org.jetbrains.kotlinx:kover:0.4.1")
         classpath("com.hiya:jacoco-android:0.2")
         classpath("gradle.plugin.org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.12.0")
         classpath("org.jetbrains.kotlin:kotlin-serialization:1.6.10")
@@ -38,9 +37,8 @@ allprojects {
 }
 
 subprojects {
-    apply(from = "../buildscripts/ktlint.gradle")
-    apply(from = "../buildscripts/versionsplugin.gradle")
-    apply(from = "../buildscripts/kover.gradle")
+    apply(from = "${rootProject.projectDir}/buildscripts/ktlint.gradle")
+    apply(from = "${rootProject.projectDir}/buildscripts/versionsplugin.gradle")
 }
 
 tasks.register("clean", Delete::class) {

event-implementation/build.gradle.kts

@@ -3,7 +3,6 @@ import java.util.Properties
 
 plugins {
     kotlin("multiplatform")
-    kotlin("plugin.serialization")
     id("com.android.library")
     id("com.apollographql.apollo3").version(Versions.apollo)
     id("com.codingfeline.buildkonfig").version(Versions.buildKonfig)
@@ -27,6 +26,7 @@ kotlin {
             dependencies {
                 implementation(project(":event-api"))
                 implementation(project(":core-datetime"))
+                implementation(project(":octanegg"))
                 implementation("com.apollographql.apollo3:apollo-runtime:${Versions.apollo}")
                 implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2")
                 implementation("io.ktor:ktor-client-core:${Versions.ktor}")
@@ -40,11 +40,7 @@ kotlin {
                 implementation(kotlin("test"))
             }
         }
-        val androidMain by getting {
-            dependencies {
-                implementation("io.ktor:ktor-client-android:${Versions.ktor}")
-            }
-        }
+        val androidMain by getting
         val androidTest by getting
         val iosX64Main by getting
         val iosArm64Main by getting
@@ -54,10 +50,6 @@ kotlin {
             iosX64Main.dependsOn(this)
             iosArm64Main.dependsOn(this)
             iosSimulatorArm64Main.dependsOn(this)
-
-            dependencies {
-                implementation("io.ktor:ktor-client-ios:${Versions.ktor}")
-            }
         }
         val iosX64Test by getting
         val iosArm64Test by getting

event-implementation/src/commonMain/kotlin/com/adammcneilly/pocketleague/event/implementation/octanegg/OctaneGGEventService.kt

@@ -3,11 +3,11 @@ package com.adammcneilly.pocketleague.event.implementation.octanegg
 import com.adammcneilly.pocketleague.core.data.DataResult
 import com.adammcneilly.pocketleague.core.models.EventOverview
 import com.adammcneilly.pocketleague.core.models.EventSummary
+import com.adammcneilly.pocketleague.data.remote.octanegg.OctaneGGAPIClient
+import com.adammcneilly.pocketleague.data.remote.octanegg.dtos.EventDTO
+import com.adammcneilly.pocketleague.data.remote.octanegg.dtos.EventListResponseDTO
+import com.adammcneilly.pocketleague.data.remote.octanegg.mappers.toEventSummary
 import com.adammcneilly.pocketleague.event.api.EventRepository
-import com.adammcneilly.pocketleague.event.implementation.octanegg.dtos.EventDTO
-import com.adammcneilly.pocketleague.event.implementation.octanegg.dtos.EventListResponseDTO
-import com.adammcneilly.pocketleague.event.implementation.octanegg.mappers.toEventSummary
-import io.ktor.client.request.parameter
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
 
@@ -25,9 +25,7 @@ class OctaneGGEventService : EventRepository {
 
     override fun fetchEventSummaries(): Flow<DataResult<List<EventSummary>>> {
         return flow {
-            val apiResult = apiClient.getResponse<EventListResponseDTO>("events") {
-                this.parameter("group", "rlcs2122")
-            }
+            val apiResult = apiClient.getResponse<EventListResponseDTO>("events")
 
             val mappedResult: DataResult<List<EventSummary>> = when (apiResult) {
                 is DataResult.Success -> {

octanegg/build.gradle.kts

@@ -0,0 +1,76 @@
+plugins {
+    kotlin("multiplatform")
+    kotlin("plugin.serialization")
+    id("com.android.library")
+}
+
+kotlin {
+    android()
+
+    listOf(
+        iosX64(),
+        iosArm64(),
+        iosSimulatorArm64()
+    ).forEach {
+        it.binaries.framework {
+            baseName = "octanegg"
+        }
+    }
+
+    sourceSets {
+        val commonMain by getting {
+            dependencies {
+                implementation(project(":core-data"))
+                implementation(project(":core-models"))
+                implementation(project(":core-datetime"))
+                implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2")
+                implementation("io.ktor:ktor-client-core:${Versions.ktor}")
+                implementation("io.ktor:ktor-client-json:${Versions.ktor}")
+                implementation("io.ktor:ktor-client-logging:${Versions.ktor}")
+                implementation("io.ktor:ktor-client-serialization:${Versions.ktor}")
+            }
+        }
+        val commonTest by getting {
+            dependencies {
+                implementation(kotlin("test"))
+            }
+        }
+        val androidMain by getting {
+            dependencies {
+                implementation("io.ktor:ktor-client-android:${Versions.ktor}")
+            }
+        }
+        val androidTest by getting
+        val iosX64Main by getting
+        val iosArm64Main by getting
+        val iosSimulatorArm64Main by getting
+        val iosMain by creating {
+            dependsOn(commonMain)
+            iosX64Main.dependsOn(this)
+            iosArm64Main.dependsOn(this)
+            iosSimulatorArm64Main.dependsOn(this)
+
+            dependencies {
+                implementation("io.ktor:ktor-client-ios:${Versions.ktor}")
+            }
+        }
+        val iosX64Test by getting
+        val iosArm64Test by getting
+        val iosSimulatorArm64Test by getting
+        val iosTest by creating {
+            dependsOn(commonTest)
+            iosX64Test.dependsOn(this)
+            iosArm64Test.dependsOn(this)
+            iosSimulatorArm64Test.dependsOn(this)
+        }
+    }
+}
+
+android {
+    compileSdk = AndroidConfig.compileSDK
+    sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
+    defaultConfig {
+        minSdk = AndroidConfig.minSDK
+        targetSdk = AndroidConfig.targetSDK
+    }
+}

octanegg/src/androidMain/AndroidManifest.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="com.adammcneilly.pocketleague.data.remote.octanegg" />

event-implementation/src/commonMain/kotlin/com/adammcneilly/pocketleague/event/implementation/octanegg/OctaneGGAPIClient.kt → octanegg/src/commonMain/kotlin/com/adammcneilly/pocketleague/data/remote/octanegg/OctaneGGAPIClient.kt

@@ -1,4 +1,4 @@
-package com.adammcneilly.pocketleague.event.implementation.octanegg
+package com.adammcneilly.pocketleague.data.remote.octanegg
 
 import com.adammcneilly.pocketleague.core.data.DataResult
 import io.ktor.client.HttpClient
@@ -12,7 +12,7 @@ import kotlinx.serialization.json.Json
 /**
  * Defines the API client information for communicating with the octane.gg API.
  */
-internal class OctaneGGAPIClient {
+class OctaneGGAPIClient {
     val baseURL = "https://zsr.octane.gg/"
 
     val httpClient = HttpClient {

octanegg/src/commonMain/kotlin/com/adammcneilly/pocketleague/data/remote/octanegg/dtos/AccountDTO.kt

@@ -0,0 +1,15 @@
+package com.adammcneilly.pocketleague.data.remote.octanegg.dtos
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+/**
+ * Represents a [PlayerDTO] account within the octane.gg API.
+ */
+@Serializable
+data class AccountDTO(
+    @SerialName("id")
+    val id: String? = null,
+    @SerialName("platform")
+    val platform: String? = null,
+)

event-implementation/src/commonMain/kotlin/com/adammcneilly/pocketleague/event/implementation/octanegg/dtos/EventDTO.kt → octanegg/src/commonMain/kotlin/com/adammcneilly/pocketleague/data/remote/octanegg/dtos/EventDTO.kt

@@ -1,4 +1,4 @@
-package com.adammcneilly.pocketleague.event.implementation.octanegg.dtos
+package com.adammcneilly.pocketleague.data.remote.octanegg.dtos
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -7,7 +7,7 @@ import kotlinx.serialization.Serializable
  * A data class mapping to an Event from the octane.gg API.
  */
 @Serializable
-internal data class EventDTO(
+data class EventDTO(
     @SerialName("_id")
     val id: String,
     val endDate: String? = null,

event-implementation/src/commonMain/kotlin/com/adammcneilly/pocketleague/event/implementation/octanegg/dtos/EventListResponseDTO.kt → octanegg/src/commonMain/kotlin/com/adammcneilly/pocketleague/data/remote/octanegg/dtos/EventListResponseDTO.kt

@@ -1,12 +1,12 @@
-package com.adammcneilly.pocketleague.event.implementation.octanegg.dtos
+package com.adammcneilly.pocketleague.data.remote.octanegg.dtos
 
 import kotlinx.serialization.Serializable
 
 /**
  * A DTO that maps to an event list response from the octane.gg API.
  */
 @Serializable
-internal data class EventListResponseDTO(
+data class EventListResponseDTO(
     val events: List<EventDTO>,
     val page: Int,
     val perPage: Int,

event-implementation/src/commonMain/kotlin/com/adammcneilly/pocketleague/event/implementation/octanegg/dtos/LocationDTO.kt → octanegg/src/commonMain/kotlin/com/adammcneilly/pocketleague/data/remote/octanegg/dtos/LocationDTO.kt

@@ -1,12 +1,12 @@
-package com.adammcneilly.pocketleague.event.implementation.octanegg.dtos
+package com.adammcneilly.pocketleague.data.remote.octanegg.dtos
 
 import kotlinx.serialization.Serializable
 
 /**
  * A data class mapping to a location from the octane.gg API.
  */
 @Serializable
-internal data class LocationDTO(
+data class LocationDTO(
     val city: String? = null,
     val country: String? = null,
     val venue: String? = null,

octanegg/src/commonMain/kotlin/com/adammcneilly/pocketleague/data/remote/octanegg/dtos/PlayerDTO.kt

@@ -0,0 +1,31 @@
+package com.adammcneilly.pocketleague.data.remote.octanegg.dtos
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+/**
+ * Represents a person who is a player for a [TeamDTO] in the octane.gg API.
+ */
+@Serializable
+data class PlayerDTO(
+    @SerialName("accounts")
+    val accounts: List<AccountDTO>? = null,
+    @SerialName("coach")
+    val coach: Boolean? = null,
+    @SerialName("country")
+    val country: String? = null,
+    @SerialName("_id")
+    val id: String? = null,
+    @SerialName("name")
+    val name: String? = null,
+    @SerialName("relevant")
+    val relevant: Boolean? = null,
+    @SerialName("slug")
+    val slug: String? = null,
+    @SerialName("substitute")
+    val substitute: Boolean? = null,
+    @SerialName("tag")
+    val tag: String? = null,
+    @SerialName("team")
+    val team: TeamOverviewDTO? = null,
+)

event-implementation/src/commonMain/kotlin/com/adammcneilly/pocketleague/event/implementation/octanegg/dtos/PrizeDTO.kt → octanegg/src/commonMain/kotlin/com/adammcneilly/pocketleague/data/remote/octanegg/dtos/PrizeDTO.kt

@@ -1,12 +1,12 @@
-package com.adammcneilly.pocketleague.event.implementation.octanegg.dtos
+package com.adammcneilly.pocketleague.data.remote.octanegg.dtos
 
 import kotlinx.serialization.Serializable
 
 /**
  * A data class mapping to a prize entity from the octane.gg API.
  */
 @Serializable
-internal data class PrizeDTO(
+data class PrizeDTO(
     val amount: Double? = null,
     val currency: String? = null,
 )

event-implementation/src/commonMain/kotlin/com/adammcneilly/pocketleague/event/implementation/octanegg/dtos/StageDTO.kt → octanegg/src/commonMain/kotlin/com/adammcneilly/pocketleague/data/remote/octanegg/dtos/StageDTO.kt

@@ -1,4 +1,4 @@
-package com.adammcneilly.pocketleague.event.implementation.octanegg.dtos
+package com.adammcneilly.pocketleague.data.remote.octanegg.dtos
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -7,7 +7,7 @@ import kotlinx.serialization.Serializable
  * A data class mapping to a stage from the octane.gg API.
  */
 @Serializable
-internal data class StageDTO(
+data class StageDTO(
     @SerialName("_id")
     val id: Int,
     val endDate: String? = null,

octanegg/src/commonMain/kotlin/com/adammcneilly/pocketleague/data/remote/octanegg/dtos/TeamDTO.kt

@@ -0,0 +1,15 @@
+package com.adammcneilly.pocketleague.data.remote.octanegg.dtos
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+/**
+ * Represents a team within the octane.gg API domain.
+ */
+@Serializable
+data class TeamDTO(
+    @SerialName("players")
+    val players: List<PlayerDTO>? = null,
+    @SerialName("team")
+    val team: TeamOverviewDTO? = null,
+)