etl/src/data/database.py

@@ -298,8 +298,7 @@ class Database:
 			FROM 
 				consultancy_d.extractions
 			WHERE
-				type == 'calendar' AND
-				calendar NOT NULL
+				type == 'calendar'
 			ORDER BY
 				property_id
 		""")
@@ -320,8 +319,6 @@ class Database:
 				consultancy_d.seeds ON seeds.id = properties.seed_id 
 			LEFT JOIN 
 				consultancy_d.regions ON regions.id = seeds.region_id 
-			WHERE
-				calendar NOT NULL
 			""")
 
 	def extractions_for(self, property_id):
@@ -466,8 +463,7 @@ class Database:
 				consultancy_d.properties ON properties.id = extractions.property_id 
 			WHERE
 				type == 'calendar' AND
-				properties.seed_id = {region_id} AND
-				calendarBody NOT NULL		
+				properties.seed_id = {region_id}		
 			""")
 
 	def singleScrape_of_region(self, region_id: int, scrape_date_min: str, scrape_date_max: str):
@@ -482,8 +478,7 @@ class Database:
 				type == 'calendar' AND
 				properties.seed_id = {region_id} AND 
 				extractions.created_at >= '{scrape_date_min}' AND
-				extractions.created_at < '{scrape_date_max}' AND 
-				calendarBody NOT NULL		
+				extractions.created_at < '{scrape_date_max}'	
 			""")
 
 	def singleScrape_of_global(self, scrape_date_min: str, scrape_date_max: str):
@@ -497,8 +492,7 @@ class Database:
 			WHERE
 				type == 'calendar' AND
 				extractions.created_at >= '{scrape_date_min}' AND
-				extractions.created_at < '{scrape_date_max}' AND 
-				calendarBody NOT NULL		
+				extractions.created_at < '{scrape_date_max}'	
 			""")
 
 	def singleScrape_of_region_scrapDate(self, region_id: int, scrape_date_min: str, scrape_date_max: str):
@@ -514,8 +508,7 @@ class Database:
 				type == 'calendar' AND
 				properties.seed_id = {region_id} AND 
 				extractions.created_at >= '{scrape_date_min}' AND
-				extractions.created_at < '{scrape_date_max}' AND
-				calendarBody NOT NULL		
+				extractions.created_at < '{scrape_date_max}'	
 			""")
 
 	def singleScrape_of_global_scrapDate(self, scrape_date_min: str, scrape_date_max: str):
@@ -530,8 +523,7 @@ class Database:
 			WHERE
 				type == 'calendar' AND
 				extractions.created_at >= '{scrape_date_min}' AND
-				extractions.created_at < '{scrape_date_max}' AND
-				calendarBody NOT NULL	
+				extractions.created_at < '{scrape_date_max}'	
 			""")
 
 	def capacity_global(self):
@@ -564,8 +556,7 @@ class Database:
 			WHERE
 				type == 'calendar' AND
 				(properties.seed_id = {region_id_1} OR 
-				properties.seed_id = {region_id_2})	AND
-				calendarBody NOT NULL		
+				properties.seed_id = {region_id_2})		
 			""")
 
 	def unique_scrapeDates(self):