Merge e5c085c into 2339d57

Author: milosmns

build.gradle.kts

@@ -61,14 +61,15 @@ kotlin {
     }
 
     val commonTest by getting {
-      dependsOn(commonMain)
       dependencies {
         implementation(kotlin("test"))
         implementation("com.squareup.okio:okio-fakefilesystem:3.4.+")
         implementation("com.willowtreeapps.assertk:assertk:0.+")
       }
     }
 
+    // used by the 'getting' delegate
+    @Suppress("UNUSED_VARIABLE", "KotlinRedundantDiagnosticSuppress")
     val jvmMain by getting {
       dependsOn(commonMain)
       dependencies {
@@ -79,12 +80,14 @@ kotlin {
       }
     }
 
-    @Suppress("UNUSED_VARIABLE", "KotlinRedundantDiagnosticSuppress") // used by the 'getting' delegate
+    // used by the 'getting' delegate
+    @Suppress("UNUSED_VARIABLE", "KotlinRedundantDiagnosticSuppress")
     val jvmTest by getting {
       dependsOn(commonTest)
-      dependsOn(jvmMain)
     }
 
+    // used by the 'getting' delegate
+    @Suppress("UNUSED_VARIABLE", "KotlinRedundantDiagnosticSuppress")
     val macNativeMain by getting {
       dependsOn(commonMain)
       dependencies {
@@ -93,10 +96,10 @@ kotlin {
       }
     }
 
-    @Suppress("UNUSED_VARIABLE", "KotlinRedundantDiagnosticSuppress") // used by the 'getting' delegate
+    // used by the 'getting' delegate
+    @Suppress("UNUSED_VARIABLE", "KotlinRedundantDiagnosticSuppress")
     val macNativeTest by getting {
       dependsOn(commonTest)
-      dependsOn(macNativeMain)
     }
 
   }
@@ -120,6 +123,7 @@ kotlin {
           jvmMainCompilation.output.allOutputs,
         )
       )
+      standardInput = System.`in`
     }
 
     // make the JVM 'jar' task work

gradle.properties

@@ -1,13 +1,14 @@
 # Language properties
 kotlin.code.style=official
 kotlin.mpp.enableCInteropCommonization=true
+kotlin.mpp.applyDefaultHierarchyTemplate=false
 
 # Engine properties
 org.gradle.jvmargs=-Xmx4096m
 
 # Project properties
 config.group = xyz.marinkovic.milos
 config.artifact = codestats
-config.version = 0.4.0
+config.version = 0.5.0
 config.gitHubRepoOwner = milosmns
 config.gitHubRepoName = code-stats

src/commonMain/kotlin/Main.kt

@@ -1,13 +1,19 @@
 import calculator.di.provideGenericLongMetricCalculators
 import components.data.TeamHistoryConfig
 import history.TeamHistory
+import history.filter.transform.RepositoryDateTransform
 import history.github.di.provideGitHubHistory
 import history.github.di.provideGitHubHistoryConfig
 import history.storage.di.provideStoredHistory
 import kotlinx.coroutines.runBlocking
+import kotlinx.datetime.LocalDate
 import utils.fromFile
 
 fun main(): Unit = runBlocking {
+  /*************************************************************************
+   THESE ARE TEMPORARY EXPERIMENTS, NOT PART OF THE FINAL PRODUCT
+   *************************************************************************/
+
   println("\n== Code Stats CLI ==\n")
 
   print("Loading configuration... ")
@@ -58,16 +64,31 @@ fun main(): Unit = runBlocking {
       )
     }
 
-    stored.forEachIndexed { i, repo ->
-      println("\n== Repository #$i ==")
+    stored.forEach { repo ->
       println(repo.simpleFormat)
+      repo.codeReviews.forEach {
+        println("\t r#${it.number} ${it.createdAt} >> ${it.mergedAt} >> ${it.closedAt}")
+      }
+      repo.discussions.forEach {
+        println("\t d#${it.number} ${it.createdAt} >> ${it.closedAt}")
+      }
       println("-- ${repo.fullName} --\n")
     }
 
+    println("Filter by date? DD.MM.YYYY (empty for no filter)")
+    val dateString = readln().trim()
+    val filtered = if (dateString.isNotEmpty()) {
+      val day = dateString.substringBefore(".").toInt()
+      val month = dateString.substringAfter(".").substringBefore(".").toInt()
+      val year = dateString.substringAfterLast(".").toInt()
+      val date = LocalDate(year, month, day)
+      val transform = RepositoryDateTransform(date, date)
+      stored.map(transform)
+    } else stored
+
     // OTHER EXPERIMENTS
     provideGenericLongMetricCalculators().forEach {
-      val metric = it.calculate(stored)
-      println("\n== ${metric.name} ==")
+      val metric = it.calculate(filtered)
       println(metric.simpleFormat)
       println("-- ${metric.name} --\n")
     }

src/commonMain/kotlin/history/filter/predicate/CodeReviewCommentIsBetween.kt

@@ -0,0 +1,12 @@
+package history.filter.predicate
+
+import components.data.CodeReviewComment
+import kotlinx.datetime.LocalDate
+
+class CodeReviewCommentIsBetween(
+  private val startDateInclusive: LocalDate,
+  private val endDateInclusive: LocalDate? = null,
+) : (CodeReviewComment) -> Boolean {
+  override fun invoke(subject: CodeReviewComment) =
+    subject.createdAt.isBetween(startDateInclusive, endDateInclusive)
+}

src/commonMain/kotlin/history/filter/predicate/CodeReviewFeedbackIsBetween.kt

@@ -0,0 +1,12 @@
+package history.filter.predicate
+
+import components.data.CodeReviewFeedback
+import kotlinx.datetime.LocalDate
+
+class CodeReviewFeedbackIsBetween(
+  private val startDateInclusive: LocalDate,
+  private val endDateInclusive: LocalDate? = null,
+) : (CodeReviewFeedback) -> Boolean {
+  override fun invoke(subject: CodeReviewFeedback) =
+    subject.submittedAt?.isBetween(startDateInclusive, endDateInclusive) == true
+}

src/commonMain/kotlin/history/filter/predicate/CodeReviewIsBetween.kt

@@ -0,0 +1,30 @@
+package history.filter.predicate
+
+import components.data.CodeReview
+import kotlinx.datetime.LocalDate
+
+class CodeReviewIsBetween(
+  private val startDateInclusive: LocalDate,
+  private val endDateInclusive: LocalDate? = null,
+) : (CodeReview) -> Boolean {
+  override fun invoke(subject: CodeReview): Boolean {
+    val isMergedOnTime = when {
+      endDateInclusive == null -> true
+      subject.mergedAt == null -> false
+      else -> subject.mergedAt.date <= endDateInclusive
+    }
+    val isClosedOnTime = when {
+      endDateInclusive == null -> true
+      subject.closedAt == null -> false
+      else -> subject.closedAt.date <= endDateInclusive
+    }
+    val isFinishedOnTime = when {
+      subject.mergedAt != null && subject.closedAt == null -> isMergedOnTime
+      subject.mergedAt == null && subject.closedAt != null -> isClosedOnTime
+      subject.mergedAt != null && subject.closedAt != null -> isMergedOnTime && isClosedOnTime
+      else -> isMergedOnTime || isClosedOnTime
+    }
+    val isCreatedBetween = subject.createdAt.isBetween(startDateInclusive, endDateInclusive)
+    return isFinishedOnTime && isCreatedBetween
+  }
+}

src/commonMain/kotlin/history/filter/predicate/DiscussionCommentIsBetween.kt

@@ -0,0 +1,12 @@
+package history.filter.predicate
+
+import components.data.DiscussionComment
+import kotlinx.datetime.LocalDate
+
+class DiscussionCommentIsBetween(
+  private val startDateInclusive: LocalDate,
+  private val endDateInclusive: LocalDate? = null,
+) : (DiscussionComment) -> Boolean {
+  override fun invoke(subject: DiscussionComment) =
+    subject.createdAt.isBetween(startDateInclusive, endDateInclusive)
+}

src/commonMain/kotlin/history/filter/predicate/DiscussionIsBetween.kt

@@ -0,0 +1,19 @@
+package history.filter.predicate
+
+import components.data.Discussion
+import kotlinx.datetime.LocalDate
+
+class DiscussionIsBetween(
+  private val startDateInclusive: LocalDate,
+  private val endDateInclusive: LocalDate? = null,
+) : (Discussion) -> Boolean {
+  override fun invoke(subject: Discussion): Boolean {
+    val isClosedOnTime = when {
+      endDateInclusive == null -> true
+      subject.closedAt == null -> false
+      else -> subject.closedAt.date <= endDateInclusive
+    }
+    val isCreatedBetween = subject.createdAt.isBetween(startDateInclusive, endDateInclusive)
+    return isClosedOnTime && isCreatedBetween
+  }
+}

src/commonMain/kotlin/history/filter/predicate/LocalDateTimeIsBetween.kt

@@ -0,0 +1,13 @@
+package history.filter.predicate
+
+import kotlinx.datetime.LocalDate
+import kotlinx.datetime.LocalDateTime
+
+fun LocalDateTime.isBetween(
+  startDateInclusive: LocalDate,
+  endDateInclusive: LocalDate? = null,
+) = when {
+  date < startDateInclusive -> false
+  endDateInclusive != null && date > endDateInclusive -> false
+  else -> true
+}

src/commonMain/kotlin/history/filter/transform/CodeReviewDateTransform.kt

@@ -0,0 +1,16 @@
+package history.filter.transform
+
+import components.data.CodeReview
+import history.filter.predicate.CodeReviewCommentIsBetween
+import history.filter.predicate.CodeReviewFeedbackIsBetween
+import kotlinx.datetime.LocalDate
+
+class CodeReviewDateTransform(
+  private val openDateInclusive: LocalDate,
+  private val closeDateInclusive: LocalDate? = null,
+) : (CodeReview) -> CodeReview {
+  override fun invoke(subject: CodeReview) = subject.copy(
+    comments = subject.comments.filter(CodeReviewCommentIsBetween(openDateInclusive, closeDateInclusive)),
+    feedbacks = subject.feedbacks.filter(CodeReviewFeedbackIsBetween(openDateInclusive, closeDateInclusive)),
+  )
+}