Feat: Forecasts Tool

apps/picsa-apps/dashboard/src/app/modules/climate/climate-api.mapping.ts

@@ -110,7 +110,7 @@ export const ApiMapping = (
       // setup metadata
       const fileBlob = data as any as Blob;
       const bucketId = country_code as string;
-      const folderPath = 'climate/forecasts';
+      const folderPath = 'forecasts/daily';
       // upload to storage
       const { fullPath } = await storage.putFile({ bucketId, fileBlob, filename: filepath, folderPath });
 

apps/picsa-apps/dashboard/src/app/modules/climate/pages/forecast/forecast.component.ts

@@ -155,6 +155,7 @@ export class ClimateForecastPageComponent {
   }
 
   private async downloadStorageFile(row: IForecastRow) {
+    // TODO - invoke cloud function instead of direct
     this.activeDownloads.update((v) => ({ ...v, [row.id]: 'pending' }));
     const storagePath = await this.service.loadFromAPI.forecast_file(row);
     this.activeDownloads.update((v) => ({ ...v, [row.id]: 'complete' }));

apps/picsa-apps/extension-app/src/app/components/layout.html

@@ -20,7 +20,7 @@
           </div>
         </a>
         }
-        <a mat-list-item routerLink="/resources/collection/weatherResources" (click)="drawer.close()">
+        <a mat-list-item routerLink="/forecasts" (click)="drawer.close()">
           <div style="display: flex; align-items: center">
             <mat-icon style="margin-right: 8px">cloud</mat-icon>
             <span>{{ 'Forecasts' | translate}}</span>

apps/picsa-apps/extension-app/src/app/routes/tool-routes.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @nx/enforce-module-boundaries */
 import { Routes } from '@angular/router';
 
 export const TOOL_ROUTES: Routes = [
@@ -16,6 +17,10 @@ export const TOOL_ROUTES: Routes = [
     loadChildren: () =>
       import('@picsa/crop-probability/src/app/app.module-embedded').then((mod) => mod.CropProbabilityToolModule),
   },
+  {
+    path: 'forecasts',
+    loadComponent: () => import('@picsa/forecasts/pages/forecast/forecast.page').then((mod) => mod.ForecastComponent),
+  },
   {
     path: 'monitoring',
     loadChildren: () => import('@picsa/monitoring/src/app/app.module-embedded').then((mod) => mod.MonitoringToolModule),

apps/picsa-server/supabase/functions/dashboard/forecast-db.ts

@@ -61,9 +61,9 @@ async function getCountryUpdates(country_code: string, query_prefix: string) {
   // filter results to only include api forecasts not present on db
   const apiForecasts = await getApiForecasts({ country_code, query_prefix });
   const dbForecasts = await getDBForecasts({ country_code, query_prefix });
-
   const dbForecastIds = dbForecasts.map((v) => v.id);
   const newForecasts = apiForecasts.filter((v) => !dbForecastIds.includes(v.name));
+  console.log(`${country_code}: ${newForecasts.length} New Forecasts`);
   if (newForecasts.length === 0) {
     return [];
   }
@@ -92,12 +92,12 @@ async function getApiForecasts(query: { country_code: string; query_prefix?: str
 async function getDBForecasts(query: { country_code: string; query_prefix: string }) {
   const supabaseClient = getClient();
   const { country_code, query_prefix } = query;
-  console.log('db query', query_prefix, country_code);
   const { data, error } = await supabaseClient
     .from('forecasts')
     .select('*')
     .like('id', `${query_prefix}%`)
     .eq('country_code', country_code)
+    .eq('forecast_type', 'daily')
     .order('id', { ascending: false });
 
   if (error) {

apps/picsa-server/supabase/functions/dashboard/forecast-storage.ts

@@ -32,26 +32,30 @@ class ForecastStorageUpdate {
   }
 
   async populateStorageFiles(params: IReqParams) {
-    const { limit = 5 } = params;
+    const { limit = 20 } = params;
     const pending = await this.listPendingFiles(limit);
 
     const updates: IDBClimateForecastRow[] = [];
     const errors: any[] = [];
-    // TODO - make parallel and allow failure
-    for (const { country_code, id } of pending) {
+    const promises = pending.map(async ({ country_code, id }) => {
       const { data, error } = await this.storeForecast(country_code, id);
       if (error) {
         errors.push(error);
       }
       if (data) {
         updates.push(data);
       }
+    });
+    await Promise.allSettled(promises);
+    for (const error of errors) {
+      console.error(error);
     }
+    console.log(`[${updates.length}] storage files populates\n[${errors.length}] errors recorded`);
     return { data: updates, error: errors };
   }
 
   /** Check all climate forecast db entries for any that are missing corresponding storage files */
-  private async listPendingFiles(limit = 5) {
+  private async listPendingFiles(limit: number) {
     const query = this.table.select('*').is('storage_file', null).order('id', { ascending: false }).limit(limit);
     const { data, error } = await query;
     if (error) {
@@ -78,9 +82,13 @@ class ForecastStorageUpdate {
     if (fileData) {
       // upload to supabase storage
       const contentType = apiResponse.headers.get('content-type') as string;
+      const year = id.substring(0, 4);
+      const month = id.substring(4, 6);
+      const day = id.substring(6, 8);
+      const filename = id.substring(9);
       const { data: uploadData, error: uploadError } = await supabaseClient.storage
         .from(country_code)
-        .upload(`climate/forecasts/${id}`, fileData, { contentType, upsert: true });
+        .upload(`forecasts/daily/${year}/${month}/${day}/${filename}`, fileData, { contentType, upsert: true });
       if (uploadError) {
         return { error: uploadError };
       }

apps/picsa-tools/climate-tool/src/app/app-routing.module.ts

@@ -15,11 +15,6 @@ export const ROUTES_COMMON: Routes = [
       headerStyle: 'inverted',
     },
   },
-  {
-    path: 'forecast',
-    loadComponent: () => import('./pages/forecast/forecast.page').then((mod) => mod.ClimateForecastComponent),
-    title: translateMarker('Forecast'),
-  },
   {
     path: 'site',
     redirectTo: '',

apps/picsa-tools/crop-probability-tool/src/app/components/station-select/station-select.component.ts

@@ -15,6 +15,8 @@ import { IStationRouteQueryParams } from '../../models';
 export class CropProbabilityStationSelectComponent {
   @Input() selectedStationId?: string;
 
+  // TODO - refactor to use geoLocation data (similar to forecasts page)
+  // and show fallback if no data available
   private stationsByCountry = computed(() => {
     const { country_code } = this.configurationService.userSettings();
     if (country_code) {

apps/picsa-tools/extension-content/src/app/pages/home/extension-home.component.ts

@@ -87,9 +87,7 @@ const ADDITIONAL_LINKS: IPageLink[] = [
   {
     name: translateMarker('Forecasts'),
     svgIcon: 'extension_app:forecasts_tool',
-    // HACK - forecasts currently child resource collection
-    // TODO - move to standalone tool
-    url: '/resources/collection/weatherResources',
+    url: '/forecasts',
     tourId: 'forecasts',
   },
   {

apps/picsa-tools/forecasts-tool/.eslintrc.json

@@ -0,0 +1,33 @@
+{
+  "extends": ["../../../.eslintrc.json"],
+  "ignorePatterns": ["!**/*"],
+  "overrides": [
+    {
+      "files": ["*.ts"],
+      "extends": ["plugin:@nx/angular", "plugin:@angular-eslint/template/process-inline-templates"],
+      "rules": {
+        "@angular-eslint/directive-selector": [
+          "error",
+          {
+            "type": "attribute",
+            "prefix": "forecast",
+            "style": "camelCase"
+          }
+        ],
+        "@angular-eslint/component-selector": [
+          "error",
+          {
+            "type": "element",
+            "prefix": "forecast",
+            "style": "kebab-case"
+          }
+        ]
+      }
+    },
+    {
+      "files": ["*.html"],
+      "extends": ["plugin:@nx/angular-template"],
+      "rules": {}
+    }
+  ]
+}

apps/picsa-tools/forecasts-tool/jest.config.ts

@@ -0,0 +1,21 @@
+export default {
+  displayName: 'forecasts-tool',
+  preset: '../../../jest.preset.js',
+  setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
+  coverageDirectory: '../../../coverage/apps/picsa-tools/forecasts-tool',
+  transform: {
+    '^.+\\.(ts|mjs|js|html)$': [
+      'jest-preset-angular',
+      {
+        tsconfig: '<rootDir>/tsconfig.spec.json',
+        stringifyContentPathRegex: '\\.(html|svg)$',
+      },
+    ],
+  },
+  transformIgnorePatterns: ['node_modules/(?!.*\\.mjs$)'],
+  snapshotSerializers: [
+    'jest-preset-angular/build/serializers/no-ng-attributes',
+    'jest-preset-angular/build/serializers/ng-snapshot',
+    'jest-preset-angular/build/serializers/html-comment',
+  ],
+};

apps/picsa-tools/forecasts-tool/project.json

@@ -0,0 +1,90 @@
+{
+  "name": "forecasts-tool",
+  "$schema": "../../../node_modules/nx/schemas/project-schema.json",
+  "projectType": "application",
+  "prefix": "app",
+  "sourceRoot": "apps/picsa-tools/forecasts-tool/src",
+  "tags": [],
+  "targets": {
+    "build": {
+      "executor": "@angular-devkit/build-angular:application",
+      "outputs": ["{options.outputPath}"],
+      "options": {
+        "outputPath": "dist/apps/picsa-tools/forecasts-tool",
+        "index": "apps/picsa-tools/forecasts-tool/src/index.html",
+        "browser": "apps/picsa-tools/forecasts-tool/src/main.ts",
+        "polyfills": ["zone.js"],
+        "tsConfig": "apps/picsa-tools/forecasts-tool/tsconfig.app.json",
+        "inlineStyleLanguage": "scss",
+        "assets": [
+          {
+            "glob": "**/*",
+            "input": "apps/picsa-tools/forecasts-tool/public"
+          }
+        ],
+        "styles": ["apps/picsa-tools/forecasts-tool/src/styles.scss"],
+        "scripts": []
+      },
+      "configurations": {
+        "production": {
+          "budgets": [
+            {
+              "type": "initial",
+              "maximumWarning": "500kb",
+              "maximumError": "4mb"
+            },
+            {
+              "type": "anyComponentStyle",
+              "maximumWarning": "4kb",
+              "maximumError": "8kb"
+            }
+          ],
+          "outputHashing": "all"
+        },
+        "development": {
+          "optimization": false,
+          "extractLicenses": false,
+          "sourceMap": true
+        }
+      },
+      "defaultConfiguration": "production"
+    },
+    "serve": {
+      "executor": "@angular-devkit/build-angular:dev-server",
+      "configurations": {
+        "production": {
+          "buildTarget": "forecasts-tool:build:production"
+        },
+        "development": {
+          "buildTarget": "forecasts-tool:build:development"
+        }
+      },
+      "defaultConfiguration": "development"
+    },
+    "extract-i18n": {
+      "executor": "@angular-devkit/build-angular:extract-i18n",
+      "options": {
+        "buildTarget": "forecasts-tool:build"
+      }
+    },
+    "lint": {
+      "executor": "@nx/eslint:lint"
+    },
+    "test": {
+      "executor": "@nx/jest:jest",
+      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
+      "options": {
+        "jestConfig": "apps/picsa-tools/forecasts-tool/jest.config.ts"
+      }
+    },
+    "serve-static": {
+      "executor": "@nx/web:file-server",
+      "options": {
+        "buildTarget": "forecasts-tool:build",
+        "port": 4200,
+        "staticFilePath": "dist/apps/picsa-tools/forecasts-tool/browser",
+        "spa": true
+      }
+    }
+  }
+}