From 758fc5627771c95d661e073de1e67d10fa5a64ff Mon Sep 17 00:00:00 2001
From: Jakub Kalinowski <kalina559@gmail.com>
Date: Sun, 18 Dec 2022 11:05:14 +0100
Subject: [PATCH] Issue 1576: Solving problems with habitbull import (#1591)

* Recomputing the habit after import, corrected order of magnitude

* Corrected HabitBullCSV3 test and added a new one
---
 uhabits-core/assets/test/habitbull4.csv       |  3 +++
 .../uhabits/core/io/HabitBullCSVImporter.kt   |  4 +++-
 .../org/isoron/uhabits/core/io/ImportTest.kt  | 19 +++++++++++++++++--
 3 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 uhabits-core/assets/test/habitbull4.csv

diff --git a/uhabits-core/assets/test/habitbull4.csv b/uhabits-core/assets/test/habitbull4.csv
new file mode 100644
index 000000000..b2fdf504a
--- /dev/null
+++ b/uhabits-core/assets/test/habitbull4.csv
@@ -0,0 +1,3 @@
+HabitName,HabitDescription,HabitCategory,CalendarDate,Value,CommentText
+Caffeine,,Coffee Consumption,2022-11-21,80,
+Caffeine,,Coffee Consumption,2022-11-22,80,
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/io/HabitBullCSVImporter.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/io/HabitBullCSVImporter.kt
index 4d47ca8c2..63f359115 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/io/HabitBullCSVImporter.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/io/HabitBullCSVImporter.kt
@@ -86,10 +86,12 @@ class HabitBullCSVImporter
                         logger.info("Found a value of $value, considering this habit as numerical.")
                         h.type = HabitType.NUMERICAL
                     }
-                    h.originalEntries.add(Entry(timestamp, value, notes))
+                    h.originalEntries.add(Entry(timestamp, value * 1000, notes))
                 }
             }
         }
+
+        map.forEach { (_, habit) -> habit.recompute() }
     }
 
     private fun parseTimestamp(rawValue: String): Timestamp {
diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/io/ImportTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/io/ImportTest.kt
index b8949d4b0..9c53d149c 100644
--- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/io/ImportTest.kt
+++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/io/ImportTest.kt
@@ -85,8 +85,8 @@ class ImportTest : BaseUnitTest() {
         assertThat(habit.type, equalTo(HabitType.NUMERICAL))
         assertThat(habit.description, equalTo(""))
         assertThat(habit.frequency, equalTo(Frequency.DAILY))
-        assertThat(getValue(habit, 2021, 9, 1), equalTo(30))
-        assertThat(getValue(habit, 2022, 1, 8), equalTo(100))
+        assertThat(getValue(habit, 2021, 9, 1), equalTo(30000))
+        assertThat(getValue(habit, 2022, 1, 8), equalTo(100000))
 
         val habit2 = habitList.getByPosition(1)
         assertThat(habit2.name, equalTo("run"))
@@ -98,6 +98,21 @@ class ImportTest : BaseUnitTest() {
         assertTrue(isChecked(habit2, 2022, 1, 19))
     }
 
+    @Test
+    @Throws(IOException::class)
+    fun testHabitBullCSV4() {
+        importFromFile("habitbull4.csv")
+        assertThat(habitList.size(), equalTo(1))
+
+        val habit = habitList.getByPosition(0)
+        assertThat(habit.name, equalTo("Caffeine"))
+        assertThat(habit.type, equalTo(HabitType.NUMERICAL))
+        assertThat(habit.description, equalTo(""))
+        assertThat(habit.frequency, equalTo(Frequency.DAILY))
+        assertThat(getValue(habit, 2022, 11, 21), equalTo(80000))
+        assertThat(getValue(habit, 2022, 11, 22), equalTo(80000))
+    }
+
     @Test
     @Throws(IOException::class)
     fun testLoopDB() {