From 53c3f8dd2aaa49913b06fb3dc350803a2aa6d41d Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Tue, 6 Jun 2023 13:53:30 +0200
Subject: [PATCH] Change reminder day for Barkbeetle [BN-9]

---
 .../vips/logic/modules/barkbeetle/BarkbeetleBean.java  |  6 +++---
 .../logic/modules/barkbeetle/BarkbeetleBeanTest.java   | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/no/nibio/vips/logic/modules/barkbeetle/BarkbeetleBean.java b/src/main/java/no/nibio/vips/logic/modules/barkbeetle/BarkbeetleBean.java
index 64a6f555..58a5ecac 100644
--- a/src/main/java/no/nibio/vips/logic/modules/barkbeetle/BarkbeetleBean.java
+++ b/src/main/java/no/nibio/vips/logic/modules/barkbeetle/BarkbeetleBean.java
@@ -703,7 +703,7 @@ public class BarkbeetleBean {
     }
 
     /**
-     * Second reminder is to be sent Thursday in the registration week
+     * Second reminder is to be sent Wednesday in the registration week
      *
      * @param currentDate
      * @return
@@ -712,8 +712,8 @@ public class BarkbeetleBean {
         Calendar cal = Calendar.getInstance(BarkbeetleBean.NORGE_MITT_NORGE);
         cal.setTime(currentDate);
         Integer week = cal.get(Calendar.WEEK_OF_YEAR);
-        Boolean isThursday = cal.get(Calendar.DAY_OF_WEEK) == Calendar.THURSDAY;
-        return BarkbeetleBean.TRAP_EMPTYING_WEEKS.contains(week) && isThursday;
+        Boolean isWednesday = cal.get(Calendar.DAY_OF_WEEK) == Calendar.WEDNESDAY;
+        return BarkbeetleBean.TRAP_EMPTYING_WEEKS.contains(week) && isWednesday;
     }
 
     public void checkAndSendTrapEmptyingReminder(Date currentDate) {
diff --git a/src/test/java/no/nibio/vips/logic/modules/barkbeetle/BarkbeetleBeanTest.java b/src/test/java/no/nibio/vips/logic/modules/barkbeetle/BarkbeetleBeanTest.java
index b7b7a0f9..a7e6bfc3 100644
--- a/src/test/java/no/nibio/vips/logic/modules/barkbeetle/BarkbeetleBeanTest.java
+++ b/src/test/java/no/nibio/vips/logic/modules/barkbeetle/BarkbeetleBeanTest.java
@@ -109,33 +109,33 @@ public class BarkbeetleBeanTest {
         Calendar cal = Calendar.getInstance();
         cal.set(Calendar.YEAR, 2023);
         cal.set(Calendar.MONTH, Calendar.MAY);
-        cal.set(Calendar.DATE, 25);
+        cal.set(Calendar.DATE, 24);
         Date currentDate = cal.getTime();
         System.out.println("currentDate=" + currentDate);
         BarkbeetleBean instance = new BarkbeetleBean();
         Boolean result = instance.isTimeToSendSecondReminder(currentDate);
         assertTrue(result);
         
-        cal.set(Calendar.DATE, 24);
+        cal.set(Calendar.DATE, 23);
         currentDate = cal.getTime();
         result = instance.isTimeToSendSecondReminder(currentDate);
         assertFalse(result);
         
         // Week 24
         cal.set(Calendar.MONTH, Calendar.JUNE);
-        cal.set(Calendar.DATE, 15);
+        cal.set(Calendar.DATE, 14);
         currentDate = cal.getTime();
         assertTrue(instance.isTimeToSendSecondReminder(currentDate));
         
         // Week 28
         cal.set(Calendar.MONTH, Calendar.JULY);
-        cal.set(Calendar.DATE, 13);
+        cal.set(Calendar.DATE, 12);
         currentDate = cal.getTime();
         assertTrue(instance.isTimeToSendSecondReminder(currentDate));
         
         // Week 33
         cal.set(Calendar.MONTH, Calendar.AUGUST);
-        cal.set(Calendar.DATE, 17);
+        cal.set(Calendar.DATE, 16);
         currentDate = cal.getTime();
         assertTrue(instance.isTimeToSendSecondReminder(currentDate));
         
-- 
GitLab