[RND-698] Postgresql insert/get (#340)

Ed-Fi-Exchange-OSS · Jan 17, 2024 · 889fbd4 · 889fbd4
1 parent 2e141a1
commit 889fbd4
Show file tree

Hide file tree

Showing 27 changed files with 289 additions and 62 deletions.
diff --git a/Meadowlark-js/backends/meadowlark-elasticsearch-backend/package.json b/Meadowlark-js/backends/meadowlark-elasticsearch-backend/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@edfi/meadowlark-elasticsearch-backend",
   "main": "dist/index.js",
-  "version": "0.4.1-pre.5",
+  "version": "0.4.1-pre.6",
   "description": "Meadowlark backend plugin for elasticsearch",
   "license": "Apache-2.0",
   "publishConfig": {
@@ -19,8 +19,8 @@
     "build:copy-non-ts": "copyfiles -u 1 -e \"**/*.ts\" \"src/**/*\" dist --verbose"
   },
   "dependencies": {
-    "@edfi/meadowlark-core": "0.4.1-pre.5",
-    "@edfi/meadowlark-utilities": "0.4.1-pre.5",
+    "@edfi/meadowlark-core": "0.4.1-pre.6",
+    "@edfi/meadowlark-utilities": "0.4.1-pre.6",
     "@elastic/elasticsearch": "^8.10.0",
     "@elastic/transport": "^8.3.4"
   },

diff --git a/Meadowlark-js/backends/meadowlark-mongodb-backend/package.json b/Meadowlark-js/backends/meadowlark-mongodb-backend/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@edfi/meadowlark-mongodb-backend",
   "main": "dist/index.js",
-  "version": "0.4.1-pre.5",
+  "version": "0.4.1-pre.6",
   "description": "Meadowlark backend plugin for MongoDB",
   "license": "Apache-2.0",
   "publishConfig": {
@@ -19,9 +19,9 @@
     "build:copy-non-ts": "copyfiles -u 1 -e \"**/*.ts\" \"src/**/*\" dist --verbose"
   },
   "dependencies": {
-    "@edfi/meadowlark-authz-server": "0.4.1-pre.5",
-    "@edfi/meadowlark-core": "0.4.1-pre.5",
-    "@edfi/meadowlark-utilities": "0.4.1-pre.5",
+    "@edfi/meadowlark-authz-server": "0.4.1-pre.6",
+    "@edfi/meadowlark-core": "0.4.1-pre.6",
+    "@edfi/meadowlark-utilities": "0.4.1-pre.6",
     "async-retry": "^1.3.3",
     "mongodb": "^5.9.2",
     "ramda": "0.29.1"

diff --git a/Meadowlark-js/backends/meadowlark-opensearch-backend/package.json b/Meadowlark-js/backends/meadowlark-opensearch-backend/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@edfi/meadowlark-opensearch-backend",
   "main": "dist/index.js",
-  "version": "0.4.1-pre.5",
+  "version": "0.4.1-pre.6",
   "description": "Meadowlark backend plugin for OpenSearch",
   "license": "Apache-2.0",
   "publishConfig": {
@@ -19,8 +19,8 @@
     "build:copy-non-ts": "copyfiles -u 1 -e \"**/*.ts\" \"src/**/*\" dist --verbose"
   },
   "dependencies": {
-    "@edfi/meadowlark-core": "0.4.1-pre.5",
-    "@edfi/meadowlark-utilities": "0.4.1-pre.5",
+    "@edfi/meadowlark-core": "0.4.1-pre.6",
+    "@edfi/meadowlark-utilities": "0.4.1-pre.6",
     "@opensearch-project/opensearch": "^2.4.0"
   },
   "devDependencies": {

diff --git a/Meadowlark-js/backends/meadowlark-postgresql-backend/package.json b/Meadowlark-js/backends/meadowlark-postgresql-backend/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@edfi/meadowlark-postgresql-backend",
   "main": "dist/index.js",
-  "version": "0.4.1-pre.5",
+  "version": "0.4.1-pre.6",
   "description": "Meadowlark backend plugin for PostgreSQL",
   "license": "Apache-2.0",
   "publishConfig": {
@@ -19,9 +19,9 @@
     "build:copy-non-ts": "copyfiles -u 1 -e \"**/*.ts\" \"src/**/*\" dist --verbose"
   },
   "dependencies": {
-    "@edfi/meadowlark-authz-server": "0.4.1-pre.5",
-    "@edfi/meadowlark-core": "0.4.1-pre.5",
-    "@edfi/meadowlark-utilities": "0.4.1-pre.5",
+    "@edfi/meadowlark-authz-server": "0.4.1-pre.6",
+    "@edfi/meadowlark-core": "0.4.1-pre.6",
+    "@edfi/meadowlark-utilities": "0.4.1-pre.6",
     "pg": "^8.11.3",
     "pg-format": "^1.0.4",
     "ramda": "0.29.1"

diff --git a/Meadowlark-js/lerna.json b/Meadowlark-js/lerna.json
@@ -1,5 +1,5 @@
 {
   "lerna": "8.0.2",
-  "version": "0.4.1-pre.5",
+  "version": "0.4.1-pre.6",
   "npmClient": "npm"
 }
diff --git a/Meadowlark-js/package-lock.json b/Meadowlark-js/package-lock.json
diff --git a/Meadowlark-js/packages/meadowlark-authz-server/package.json b/Meadowlark-js/packages/meadowlark-authz-server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@edfi/meadowlark-authz-server",
   "main": "dist/index.js",
-  "version": "0.4.1-pre.5",
+  "version": "0.4.1-pre.6",
   "description": "Meadowlark authorization server",
   "license": "Apache-2.0",
   "publishConfig": {
@@ -14,7 +14,7 @@
   ],
   "dependencies": {
     "@apideck/better-ajv-errors": "^0.3.6",
-    "@edfi/meadowlark-utilities": "0.4.1-pre.5",
+    "@edfi/meadowlark-utilities": "0.4.1-pre.6",
     "ajv": "^8.12.0",
     "didyoumean2": "^6.0.1",
     "dotenv": "^16.3.1",

diff --git a/Meadowlark-js/packages/meadowlark-core/package.json b/Meadowlark-js/packages/meadowlark-core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@edfi/meadowlark-core",
   "main": "dist/index.js",
-  "version": "0.4.1-pre.5",
+  "version": "0.4.1-pre.6",
   "description": "Meadowlark core functionality",
   "license": "Apache-2.0",
   "publishConfig": {
@@ -14,7 +14,7 @@
   ],
   "dependencies": {
     "@apideck/better-ajv-errors": "^0.3.6",
-    "@edfi/meadowlark-utilities": "0.4.1-pre.5",
+    "@edfi/meadowlark-utilities": "0.4.1-pre.6",
     "@isaacs/ttlcache": "^1.4.1",
     "ajv": "^8.12.0",
     "ajv-formats": "^2.1.1",

diff --git a/Meadowlark-js/packages/meadowlark-utilities/package.json b/Meadowlark-js/packages/meadowlark-utilities/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@edfi/meadowlark-utilities",
   "main": "dist/index.js",
-  "version": "0.4.1-pre.5",
+  "version": "0.4.1-pre.6",
   "description": "Meadowlark shared utilities",
   "license": "Apache-2.0",
   "publishConfig": {

diff --git a/Meadowlark-js/services/meadowlark-fastify/package.json b/Meadowlark-js/services/meadowlark-fastify/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@edfi/meadowlark-fastify",
-  "version": "0.4.1-pre.5",
+  "version": "0.4.1-pre.6",
   "description": "Meadowlark service using Fastify",
   "license": "Apache-2.0",
   "publishConfig": {
@@ -12,9 +12,9 @@
     "/package.json"
   ],
   "dependencies": {
-    "@edfi/meadowlark-authz-server": "0.4.1-pre.5",
-    "@edfi/meadowlark-core": "0.4.1-pre.5",
-    "@edfi/meadowlark-utilities": "0.4.1-pre.5",
+    "@edfi/meadowlark-authz-server": "0.4.1-pre.6",
+    "@edfi/meadowlark-core": "0.4.1-pre.6",
+    "@edfi/meadowlark-utilities": "0.4.1-pre.6",
     "@fastify/rate-limit": "^6.0.1",
     "dotenv": "^16.3.1",
     "fastify": "^3.29.5"

diff --git a/Meadowlark-js/tests/e2e/package.json b/Meadowlark-js/tests/e2e/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@edfi/meadowlark-e2e-tests",
   "main": "dist/index.js",
-  "version": "0.4.1-pre.5",
+  "version": "0.4.1-pre.6",
   "description": "Meadowlark Ed-Fi API end to end tests",
   "license": "Apache-2.0",
   "private": true,
   "files": [],
   "devDependencies": {
-    "@edfi/meadowlark-utilities": "0.4.1-pre.5",
+    "@edfi/meadowlark-utilities": "0.4.1-pre.6",
     "@testcontainers/mongodb": "^10.3.1",
     "@testcontainers/postgresql": "^10.3.1",
     "@types/chance": "^1.1.6",

diff --git a/Meadowlark.net/.gitignore b/Meadowlark.net/.gitignore
@@ -396,3 +396,6 @@ FodyWeavers.xsd
 
 # JetBrains Rider
 *.sln.iml
+
+# DotNetEnv
+.env
diff --git a/Meadowlark.net/Meadowlark.Net.Core/.env.example b/Meadowlark.net/Meadowlark.Net.Core/.env.example
@@ -0,0 +1,4 @@
+#### PostgreSQL backend options
+
+POSTGRES_USER=
+POSTGRES_PASSWORD=
diff --git a/Meadowlark.net/Meadowlark.Net.Core/Backend/Model/GetRequest.cs b/Meadowlark.net/Meadowlark.Net.Core/Backend/Model/GetRequest.cs
@@ -0,0 +1,4 @@
+using Meadowlark.Net.Core.Model;
+namespace Meadowlark.Net.Core.Backend.Model;
+
+public record GetRequest(DocumentUuid DocumentUuid, ResourceInfo ResourceInfo);
diff --git a/Meadowlark.net/Meadowlark.Net.Core/Backend/Model/GetResponse.cs b/Meadowlark.net/Meadowlark.Net.Core/Backend/Model/GetResponse.cs
@@ -0,0 +1,4 @@
+using Meadowlark.Net.Core.Model;
+namespace Meadowlark.Net.Core.Backend.Model;
+
+public record GetResponse(string EdfiDoc);
diff --git a/Meadowlark.net/Meadowlark.Net.Core/Backend/Model/InsertRequest.cs b/Meadowlark.net/Meadowlark.Net.Core/Backend/Model/InsertRequest.cs
@@ -0,0 +1,5 @@
+using Meadowlark.Net.Core.Model;
+using Newtonsoft.Json.Linq;
+namespace Meadowlark.Net.Core.Backend.Model;
+
+public record InsertRequest(DocumentUuid DocumentUuid, ResourceInfo ResourceInfo, JObject EdfiDoc);