From 2fe9cf3d001cbc83319d1b3eeed159e79b87d2ce Mon Sep 17 00:00:00 2001 From: Jun-te Kim Date: Mon, 17 Mar 2025 18:29:39 +0000 Subject: [PATCH] week commencing worked --- etl/scraper/scraper.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/etl/scraper/scraper.py b/etl/scraper/scraper.py index 0fb83a8..a99a9d1 100644 --- a/etl/scraper/scraper.py +++ b/etl/scraper/scraper.py @@ -9,7 +9,17 @@ from functools import wraps import re from etl.validator.validator import DomnaSharePointValidator -WEEK_COMMENCING = os.getenv("WEEK_COMMENCING", "W.C. 10.03.2025") +from datetime import datetime, timedelta + +def previous_monday(date): + # If it's Monday, return the same date + if date.weekday() == 0: + return date.strftime("%d%m%y") + # Otherwise, find the previous Monday + previous_monday = date - timedelta(days=date.weekday()) + return f"W.C. {previous_monday.strftime('%d.%m.%Y')}" + +WEEK_COMMENCING = os.getenv("WEEK_COMMENCING", previous_monday()) class SharePointInstaller(Enum): SOUTH_COAST_INSULATION = os.getenv("SOUTH_COAST_INSULATION_SERVICE_SHAREPOINT_ID", None)