Add SRM as catalogue for fertilizers

.github/workflows/prerelease.yml

@@ -0,0 +1,61 @@
+name: Prerelease
+
+on:
+  pull_request:
+    paths:
+      - 'fdm-core/**'
+      - 'fdm-data/**'
+    branches:
+      - main
+
+concurrency: 
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  prerelease:
+    name: Prerelease
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [20]
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v4
+
+      - name: Cache turbo build setup
+        uses: actions/cache@v4
+        with: 
+          path: .turbo
+          key: ${{ runner.os }}-turbo-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-turbo-
+
+      - name: Setup pnpm 9
+        uses: pnpm/action-setup@v4
+        with:
+          version: 9.12.2
+
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.node-version }}
+          registry-url: 'https://npm.pkg.github.com'
+          cache: 'pnpm'
+
+      - name: Install Dependencies
+        run: pnpm i
+
+      - name: Bump snapshot
+        run: pnpm changeset version --snapshot ${{ github.head_ref }} --ignore fdm-docs
+
+      - name: Build packages
+        run: pnpm build --filter=@svenvw/fdm-core --filter=@svenvw/fdm-data
+
+      - name: Publish snapshot
+        run: pnpm changeset publish --tag ${{ github.head_ref }}
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.npmrc

@@ -0,0 +1 @@
+link-workspace-packages=true

fdm-calculator/.gitignore

@@ -22,3 +22,4 @@ dist-ssr
 *.njsproj
 *.sln
 *.sw?
+.env

fdm-calculator/package.json

@@ -45,13 +45,15 @@
     "lint": "eslint ."
   },
   "devDependencies": {
+    "@dotenvx/dotenvx": "^1.20.0",
+    "@svenvw/fdm-core": "workspace:*",
     "typescript": "^5.5.3",
     "vite": "^5.4.8",
     "vite-plugin-dts": "^4.0.2",
     "vitest": "^2.0.5"
   },
-  "dependencies": {
-    "fdm-core": "workspace:*"
+  "peerDependencies": {
+    "@svenvw/fdm-core": "workspace:>=0.3.1"
   },
   "packageManager": "pnpm@9.12.2"
 }

fdm-core/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog fdm-core
 
+## 0.4.0
+
+### Minor Changes
+
+- For `addFertilizersToCatalogue` include all parameters in `properties`
+- a2ee857: Add to `fertilizers_catalogue` the columns:`p_density`, `p_type_manure`, `p_type_mineral` and `p_type_compost`
+
 ## 0.3.1
 
 ### Patch Changes

fdm-core/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@svenvw/fdm-core",
   "private": false,
-  "version": "0.3.1",
+  "version": "0.4.0",
   "description": "Interface for the Farm Data Model",
   "license": "MIT",
   "homepage": "https://svenvw.github.io/fdm/",
@@ -68,30 +68,13 @@
   "dependencies": {
     "@electric-sql/pglite": "^0.2.12",
     "drizzle-graphql": "^0.8.5",
-    "drizzle-orm": "^0.35.3",
+    "drizzle-orm": "catalog:",
     "graphql": "^16.9.0",
     "nanoid": "^5.0.7",
     "postgres": "^3.4.4"
   },
   "packageManager": "pnpm@9.12.2",
   "publishConfig": {
     "registry": "https://npm.pkg.github.com"
-  },
-  "pnpm": {
-    "packageExtensions": {
-      "vite-plugin-dts": {
-        "dependenciesMeta": {
-          "@volar/typescript": {
-            "optional": true
-          },
-          "vue-tsc": {
-            "optional": true
-          },
-          "@vue/language-core": {
-            "optional": true
-          }
-        }
-      }
-    }
   }
 }

fdm-core/src/db/migrations/0000_pale_jean_grey.sql → fdm-core/src/db/migrations/0000_slim_lockheed.sql

@@ -1,17 +1,7 @@
 CREATE SCHEMA "fdm-dev";
 --> statement-breakpoint
-DO $$ BEGIN
- CREATE TYPE "fdm-dev"."b_manage_type" AS ENUM('owner', 'lease');
-EXCEPTION
- WHEN duplicate_object THEN null;
-END $$;
---> statement-breakpoint
-DO $$ BEGIN
- CREATE TYPE "fdm-dev"."b_sector" AS ENUM('diary', 'arable', 'tree_nursery', 'bulbs');
-EXCEPTION
- WHEN duplicate_object THEN null;
-END $$;
---> statement-breakpoint
+CREATE TYPE "fdm-dev"."b_manage_type" AS ENUM('owner', 'lease');--> statement-breakpoint
+CREATE TYPE "fdm-dev"."b_sector" AS ENUM('diary', 'arable', 'tree_nursery', 'bulbs');--> statement-breakpoint
 CREATE TABLE IF NOT EXISTS "fdm-dev"."farm_managing" (
 	"b_id" text NOT NULL,
 	"b_id_farm" text NOT NULL,
@@ -61,6 +51,7 @@ CREATE TABLE IF NOT EXISTS "fdm-dev"."fertilizers_catalogue" (
 	"p_name_en" text,
 	"p_description" text,
 	"p_dm" numeric,
+	"p_density" numeric,
 	"p_om" numeric,
 	"p_a" numeric,
 	"p_hc" numeric,
@@ -99,6 +90,9 @@ CREATE TABLE IF NOT EXISTS "fdm-dev"."fertilizers_catalogue" (
 	"p_pb_rt" numeric,
 	"p_hg_rt" numeric,
 	"p_cl_cr" numeric,
+	"p_type_manure" boolean,
+	"p_type_mineral" boolean,
+	"p_type_compost" boolean,
 	"created" timestamp with time zone DEFAULT now() NOT NULL,
 	"updated" timestamp with time zone
 );

fdm-core/src/db/migrations/meta/0000_snapshot.json

@@ -1,5 +1,5 @@
 {
-  "id": "ca7ff342-727b-4512-946e-d4fd95e324a2",
+  "id": "ba4dd387-e576-411c-8f10-79e84712e7a3",
   "prevId": "00000000-0000-0000-0000-000000000000",
   "version": "7",
   "dialect": "postgresql",
@@ -115,7 +115,8 @@
           ]
         }
       },
-      "uniqueConstraints": {}
+      "uniqueConstraints": {},
+      "checkConstraints": {}
     },
     "fdm-dev.farms": {
       "name": "farms",
@@ -173,7 +174,8 @@
       },
       "foreignKeys": {},
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
+      "uniqueConstraints": {},
+      "checkConstraints": {}
     },
     "fdm-dev.fertilizer_aquiring": {
       "name": "fertilizer_aquiring",
@@ -249,7 +251,8 @@
         }
       },
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
+      "uniqueConstraints": {},
+      "checkConstraints": {}
     },
     "fdm-dev.fertilizer_picking": {
       "name": "fertilizer_picking",
@@ -319,7 +322,8 @@
         }
       },
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
+      "uniqueConstraints": {},
+      "checkConstraints": {}
     },
     "fdm-dev.fertilizers": {
       "name": "fertilizers",
@@ -364,7 +368,8 @@
       },
       "foreignKeys": {},
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
+      "uniqueConstraints": {},
+      "checkConstraints": {}
     },
     "fdm-dev.fertilizers_catalogue": {
       "name": "fertilizers_catalogue",
@@ -406,6 +411,12 @@
           "primaryKey": false,
           "notNull": false
         },
+        "p_density": {
+          "name": "p_density",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
         "p_om": {
           "name": "p_om",
           "type": "numeric",
@@ -634,6 +645,24 @@
           "primaryKey": false,
           "notNull": false
         },
+        "p_type_manure": {
+          "name": "p_type_manure",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "p_type_mineral": {
+          "name": "p_type_mineral",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "p_type_compost": {
+          "name": "p_type_compost",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
         "created": {
           "name": "created",
           "type": "timestamp with time zone",
@@ -667,7 +696,8 @@
       },
       "foreignKeys": {},
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
+      "uniqueConstraints": {},
+      "checkConstraints": {}
     },
     "fdm-dev.fields": {
       "name": "fields",
@@ -718,7 +748,8 @@
       },
       "foreignKeys": {},
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
+      "uniqueConstraints": {},
+      "checkConstraints": {}
     }
   },
   "enums": {
@@ -745,6 +776,7 @@
     "fdm-dev": "fdm-dev"
   },
   "sequences": {},
+  "views": {},
   "_meta": {
     "columns": {},
     "schemas": {},

fdm-core/src/db/migrations/meta/_journal.json

@@ -5,8 +5,8 @@
     {
       "idx": 0,
       "version": "7",
-      "when": 1729004382718,
-      "tag": "0000_pale_jean_grey",
+      "when": 1730387776036,
+      "tag": "0000_slim_lockheed",
       "breakpoints": true
     }
   ]