Update default fields for farm group (#169)

django_project/gap/models/crop_insight.py

@@ -328,7 +328,11 @@ def default_fields_used():
  'latitude',
  'longitude',
  'SPWTopMessage',
- 'SPWDescription'
+ 'SPWDescription',
+ 'TooWet',
+ 'last_4_days_mm',
+ 'last_2_days_mm',
+ 'today_tomorrow_mm'
  ]
 
  def __init__(

django_project/spw/tests/test_crop_insight_generator.py

@@ -80,6 +80,10 @@ class TestCropInsightGenerator(TestCase):
  csv_headers = [
  'farmID', 'phoneNumber', 'latitude', 'longitude', 'SPWTopMessage',
  'SPWDescription',
+ 'TooWet',
+ 'last_4_days_mm',
+ 'last_2_days_mm',
+ 'today_tomorrow_mm',
  'day1_mm', 'day1_Chance', 'day1_Type',
  'day2_mm', 'day2_Chance', 'day2_Type',
  'day3_mm', 'day3_Chance', 'day3_Type',
@@ -333,9 +337,18 @@ def mock_send_fn(self, fail_silently=False):
  'Both current forecast '
  'historical rains have good signal to plant.'
  )
- self.assertEqual(row[6], '10.0') # Precip (daily)
- self.assertEqual(row[7], '50.0') # Precip % chance
- self.assertEqual(row[8], 'Light rain') # Precip Type
+ # Too wet column
+ self.assertEqual(
+ row[6], 'Likely too wet to plant'
+ ) # tooWet
+ self.assertEqual(row[7], '80.0') # last4Days
+ self.assertEqual(row[8], '60.0') # last2Days
+ self.assertEqual(row[9], '40.0') # todayTomorrow
+
+ # First day forecast
+ self.assertEqual(row[10], '10.0') # Precip (daily)
+ self.assertEqual(row[11], '50.0') # Precip % chance
+ self.assertEqual(row[12], 'Light rain') # Precip Type
 
  # Farm 2
  elif row_num == 3:
@@ -349,9 +362,16 @@ def mock_send_fn(self, fail_silently=False):
  self.assertEqual(
  row[5], 'Wait for more positive forecast.'
  )
- self.assertEqual(row[6], '0.5') # Precip (daily)
- self.assertEqual(row[7], '10.0') # Precip % chance
- self.assertEqual(row[8], 'No Rain') # Precip Type
+ # Too wet column
+ self.assertEqual(row[6], 'Too wet to plant') # tooWet
+ self.assertEqual(row[7], '100.0') # last4Days
+ self.assertEqual(row[8], '80.0') # last2Days
+ self.assertEqual(row[9], '80.0') # todayTomorrow
+
+ # First day forecast
+ self.assertEqual(row[10], '0.5') # Precip (daily)
+ self.assertEqual(row[11], '10.0') # Precip % chance
+ self.assertEqual(row[12], 'No Rain') # Precip Type
 
  # Farm 3
  elif row_num == 4:
@@ -363,9 +383,17 @@ def mock_send_fn(self, fail_silently=False):
  self.assertEqual(row[3], '50.2222') # Longitude
  self.assertEqual(row[4], '')
  self.assertEqual(row[5], '')
- self.assertEqual(row[6], '') # Precip (daily)
- self.assertEqual(row[7], '') # Precip % chance
- self.assertEqual(row[8], '') # Precip Type
+
+ # Too wet column
+ self.assertEqual(row[6], '') # tooWet
+ self.assertEqual(row[7], '') # last4Days
+ self.assertEqual(row[8], '') # last2Days
+ self.assertEqual(row[9], '') # todayTomorrow
+
+ # First day forecast
+ self.assertEqual(row[10], '') # Precip (daily)
+ self.assertEqual(row[11], '') # Precip % chance
+ self.assertEqual(row[12], '') # Precip Type
 
  # Farm 4 has same grid with farm 2
  elif row_num == 5:
@@ -379,9 +407,16 @@ def mock_send_fn(self, fail_silently=False):
  self.assertEqual(
  row[5], 'Wait for more positive forecast.'
  )
- self.assertEqual(row[6], '0.5') # Precip (daily)
- self.assertEqual(row[7], '10.0') # Precip % chance
- self.assertEqual(row[8], 'No Rain') # Precip Type
+ # Too wet column
+ self.assertEqual(row[6], 'Too wet to plant') # tooWet
+ self.assertEqual(row[7], '100.0') # last4Days
+ self.assertEqual(row[8], '80.0') # last2Days
+ self.assertEqual(row[9], '80.0') # todayTomorrow
+
+ # First day forecast
+ self.assertEqual(row[10], '0.5') # Precip (daily)
+ self.assertEqual(row[11], '10.0') # Precip % chance
+ self.assertEqual(row[12], 'No Rain') # Precip Type
 
  # Farm 5 has same grid with farm 3
  elif row_num == 6:
@@ -391,11 +426,17 @@ def mock_send_fn(self, fail_silently=False):
  self.assertEqual(row[1], self.farm_5.phone_number)
  self.assertEqual(row[2], '50.0') # Latitude
  self.assertEqual(row[3], '50.2222') # Longitude
- self.assertEqual(row[4], '')
- self.assertEqual(row[5], '')
- self.assertEqual(row[6], '') # Precip (daily)
- self.assertEqual(row[7], '') # Precip % chance
- self.assertEqual(row[8], '') # Precip Type
+
+ # Too wet column
+ self.assertEqual(row[6], '') # tooWet
+ self.assertEqual(row[7], '') # last4Days
+ self.assertEqual(row[8], '') # last2Days
+ self.assertEqual(row[9], '') # todayTomorrow
+
+ # First day forecast
+ self.assertEqual(row[10], '') # Precip (daily)
+ self.assertEqual(row[11], '') # Precip % chance
+ self.assertEqual(row[12], '') # Precip Type
  row_num += 1
 
  @patch('spw.generator.crop_insight.CropInsightFarmGenerator.generate_spw')