Merge pull request #277 from uw-it-aca/develop

Develop
uw-it-aca · Dec 10, 2024 · 825c426 · 825c426
2 parents ae75ed3 + 39c8deb
commit 825c426
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/data_aggregator/report_builder.py b/data_aggregator/report_builder.py
@@ -247,11 +247,12 @@ def upload_csv_file(self, csv_data):
             aws_secret_access_key=settings.EXPORT_AWS_SECRET_ACCESS_KEY)
 
         try:
-            s3client.put_object(
+            response = s3client.put_object(
                 Body=csv_data,
                 Bucket=settings.EXPORT_AWS_STORAGE_BUCKET_NAME,
                 Key=settings.EXPORT_AWS_DEFAULT_FILE_NAME,
                 ContentType="text/csv",
             )
+            logger.info(f"CSV upload completed, response: {response}")
         except Exception as ex:
-            logger.error(f"CSV write failed: {ex}")
+            logger.error(f"CSV upload failed: {ex}, response: {response}")
diff --git a/docker/prod-values.yml b/docker/prod-values.yml
@@ -153,9 +153,14 @@ cronjob:
       args: ["create_jobs", "participation"]
     # run build subaccount activity report job
     - name: subacct-activity
-      schedule: "0 21 * * 6" # At 2:00pm PDT on Saturday
+      schedule: "10 21 * * 6" # At 2:10pm PDT on Saturday
       command: ["/scripts/management_command.sh"]
       args: ["create_and_run_jobs", "build_subaccount_activity_report"]
+    # run export subaccount activity report job
+    - name: export-subacct-activity
+      schedule: "59 23 * * 6" # At 4:59pm PDT on Saturday
+      command: ["/scripts/management_command.sh"]
+      args: ["create_and_run_jobs", "export_subaccount_activity_report"]
     # add rad file job upfront so that it is created for the correct week
     - name: add-crt-rad-data
       schedule: "0 21 * * 6" # At 2:00pm PDT on Saturday