use minutes instead of hours when creating reports

Author: chrisbek

app/apple_fetch.py

@@ -35,9 +35,9 @@ def is_success(self) -> bool:
         return self.statusCode == "200"
 
 
-def apple_fetch(security_headers: dict, ids, hours_ago: int = 1) -> ResponseDto:
+def apple_fetch(security_headers: dict, ids,minutes_ago: int = 15) -> ResponseDto:
     logger.info("Fetching locations from Apple API for %s", ids)
-    startdate = unix_epoch() - hours_ago * 60 * 60
+    startdate = unix_epoch() - minutes_ago * 60 * 60 * 60
     enddate = unix_epoch()
 
     response = _acsnservice_fetch(security_headers, ids, startdate, enddate)

app/device_service.py

@@ -16,7 +16,7 @@ def fetch_and_report_locations_for_devices(
         security_headers: ICloudCredentials,
         page: int,
         limit: int,
-        hours_ago: int,
+        minutes_ago: int,
         trackers_filter: set[str] = None,
         send_reports: bool = True,
 ):
@@ -29,7 +29,7 @@ def fetch_and_report_locations_for_devices(
         devices_to_consider = [device for device in device_response.data if device.name in trackers_filter]
     else:
         devices_to_consider = device_response.data
-    apple_result = _fetch_location_metadata_from_icloud(devices_to_consider, hours_ago, security_headers)
+    apple_result = _fetch_location_metadata_from_icloud(devices_to_consider, minutes_ago, security_headers)
     device_map = create_reports(locations=apple_result.results, devices=devices_to_consider)
 
     devices_with_reports = list(device_map.values())
@@ -62,29 +62,29 @@ def fetch_limited_locations_and_generate_reports_for_them(
         limit: int,
         page: int,
         trackers_filter: set[str],
-        hours_ago: int = 1,
+        minutes_ago: int = 15,
 ) -> list[BeamerDevice]:
     try:
         device_response = _get_device_metadata_from_space_invader_api(limit, page)
     except NoMoreLocationsToFetch:
         return []
 
     devices_to_consider = [device for device in device_response.data if device.name in trackers_filter]
-    apple_result = _fetch_location_metadata_from_icloud(devices_to_consider, hours_ago, security_headers)
+    apple_result = _fetch_location_metadata_from_icloud(devices_to_consider, minutes_ago, security_headers)
     device_map = create_reports(locations=apple_result.results, devices=devices_to_consider)
 
     return list(device_map.values())
 
 
 def _fetch_location_metadata_from_icloud(
         devices_to_consider: list[BeamerDevice],
-        hours_ago: int,
+        minutes_ago: int,
         security_headers: ICloudCredentials
 ):
     apple_result = apple_fetch(
         security_headers.model_dump(mode='json', by_alias=True),
         [device.public_hash_base64 for device in devices_to_consider],
-        hours_ago=hours_ago)
+        minutes_ago=minutes_ago)
     if not apple_result.is_success:
         logger.error(f"Apple API Error[{apple_result.statusCode}]: {apple_result.error}")
         exit(1)

commands/location_and_reports.py

@@ -22,7 +22,7 @@ def resolve_locations(
         limit: int = 3000,
         page: int = 0,
         send_reports: bool = True,
-        hours_ago: int = 1,
+        minutes_ago: int = 15,
         print_report: bool = False,
 ) -> None:
     security_headers = credentials_retriever.get_headers(api_key=settings.CREDENTIALS_API_KEY)
@@ -32,7 +32,7 @@ def resolve_locations(
         security_headers=ICloudCredentials(**security_headers),
         page=page,
         limit=limit,
-        hours_ago=hours_ago,
+        minutes_ago=minutes_ago,
         trackers_filter=tracker_ids,
         send_reports=send_reports,
     )

manage.py

@@ -41,7 +41,7 @@ def fetch_locations(
         limit=limit,
         page=page,
         send_reports=send_reports,
-        hours_ago=hours_ago,
+        minutes=hours_ago * 60,
         print_report=True,
     )