Merging master

hello · Aug 26, 2016 · 863cd76 · 863cd76
1 parent 9e3f9cb
commit 863cd76
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/...processors/insights/SleepDeprivation.java → ...ore/insights/models/SleepDeprivation.java b/...processors/insights/SleepDeprivation.java → ...ore/insights/models/SleepDeprivation.java
@@ -1,12 +1,13 @@
-package com.hello.suripu.core.processors.insights;
+package com.hello.suripu.core.insights.models;
+
 import com.google.common.base.Optional;
 import com.hello.suripu.core.db.AccountReadDAO;
 import com.hello.suripu.core.db.SleepStatsDAODynamoDB;
+import com.hello.suripu.core.insights.InsightCard;
+import com.hello.suripu.core.insights.models.text.Text;
 import com.hello.suripu.core.models.Account;
 import com.hello.suripu.core.models.AggregateSleepStats;
-import com.hello.suripu.core.models.Insights.InsightCard;
 import com.hello.suripu.core.models.Insights.Message.SleepDeprivationMsgEN;
-import com.hello.suripu.core.models.Insights.Message.Text;
 import com.hello.suripu.core.models.SleepDebtProfile;
 import com.hello.suripu.core.util.DateTimeUtil;
 import org.joda.time.DateTime;

diff --git a/...re/src/main/java/com/hello/suripu/core/models/Insights/Message/SleepDeprivationMsgEN.java b/...re/src/main/java/com/hello/suripu/core/models/Insights/Message/SleepDeprivationMsgEN.java
@@ -1,5 +1,7 @@
 package com.hello.suripu.core.models.Insights.Message;
 
+import com.hello.suripu.core.insights.models.text.Text;
+
 /**
  * Created by jarredheinrich on 7/8/16.
  */

diff --git a/...nsights/SleepDeprivationInsightsTest.java → .../models/SleepDeprivationInsightsTest.java b/...nsights/SleepDeprivationInsightsTest.java → .../models/SleepDeprivationInsightsTest.java
@@ -1,13 +1,13 @@
-package com.hello.suripu.core.processors.insights;
+package com.hello.suripu.core.insights.models;
 
 import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import com.hello.suripu.core.db.AccountReadDAO;
 import com.hello.suripu.core.db.SleepStatsDAODynamoDB;
+import com.hello.suripu.core.insights.InsightCard;
 import com.hello.suripu.core.models.Account;
 import com.hello.suripu.core.models.AggregateSleepStats;
-import com.hello.suripu.core.models.Insights.InsightCard;
 import com.hello.suripu.core.models.Insights.Message.SleepDeprivationMsgEN;
 import com.hello.suripu.core.models.MotionScore;
 import com.hello.suripu.core.models.SleepStats;