From 67c508376dd667b08588055af756cf34a1418b46 Mon Sep 17 00:00:00 2001
From: franTarkenton <kevin.netherton@gov.bc.ca>
Date: Wed, 26 May 2021 15:26:01 -0700
Subject: [PATCH] Modified offsets

* Satellite data has a lag before it becomes available.
* The script has been modified so that the offset days for downloading and
processing of the data can be controlled from environment variables
(VIIRS_OFFSET and MODIS_OFFSET)
---
 .vscode/settings.json |  3 ++-
 admin/constants.py    | 10 ++++++++++
 run.py                |  4 ++--
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index a98c202..73d2965 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -25,5 +25,6 @@
     "files.trimTrailingWhitespace": true,
     "files.associations": {
         "*.jenkins": "Jenkinsfile"
-    }
+    },
+    "python.pythonPath": "/home/kjnether/proj/rfc/envs/snowpack/bin/python"
 }
diff --git a/admin/constants.py b/admin/constants.py
index 1117ff9..cd77576 100644
--- a/admin/constants.py
+++ b/admin/constants.py
@@ -57,3 +57,13 @@
 VIIRS_DAILY_20YR = os.path.join(VIIRS_DAILY_NORM, '20yr')
 
 AOI = os.path.join(os.path.dirname(__file__), '..', 'aoi')
+
+# set default values and then override with what is in the
+# env vars if populated with a valid value
+VIIRS_OFFSET = 1
+if ('VIIRS_OFFSET' in os.environ ) and os.environ['VIIRS_OFFSET']:
+    VIIRS_OFFSET=os.environ['VIIRS_OFFSET']
+
+MODIS_OFFSET = 3
+if ('MODIS_OFFSET' in os.environ) and os.environ['MODIS_OFFSET']:
+    MODIS_OFFSET=os.environ['MODIS_OFFSET']
diff --git a/run.py b/run.py
index db494c0..c1c784f 100644
--- a/run.py
+++ b/run.py
@@ -167,7 +167,7 @@ def daily_pipeline(envpth: str, date: str, clean: str, days: int = 5):
         date_l = date.split('.')
         target_date = datetime.datetime(int(date_l[0]), int(date_l[1]), int(date_l[2]))
         if target_date.date() == datetime.datetime.now(pst).date():
-            date = datetime.datetime.strftime(target_date - datetime.timedelta(days=4), '%Y.%m.%d')
+            date = datetime.datetime.strftime(target_date - datetime.timedelta(days=const.MODIS_OFFSET), '%Y.%m.%d')
         for sat in ['modis','viirs']:
             logger.info(f'Daily Pipeline running {sat} process')
             dailypipeline(envpth, date, sat, int(days), db_handler)
@@ -179,7 +179,7 @@ def daily_pipeline(envpth: str, date: str, clean: str, days: int = 5):
 def dailypipeline(envpth: str, date: str, sat: str, days: int, db_handler: DBHandler):
     if check_date(date):
         if sat == 'viirs':
-            days = 1
+            days = const.VIIRS_OFFSET #1
         #print(type())
         #logger.debug(f'download granules: {download_granules} - {download_granules.download_granules}')
         download_granules.download_granules.download_granules(envpth, date, sat, int(days))