Skip to content

Commit

Permalink
Merge branch 'develop' into fix/fixing-age-and-psycho-view
Browse files Browse the repository at this point in the history
  • Loading branch information
lemoonchild authored Nov 17, 2024
2 parents 2e6d5f2 + 5856852 commit 1c24955
Show file tree
Hide file tree
Showing 39 changed files with 8,303 additions and 5,686 deletions.
6 changes: 6 additions & 0 deletions sanitas_backend/biome.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
{
"$schema": "https://biomejs.dev/schemas/1.8.3/schema.json",
"javascript": {
"globals": ["__ENV"]
},
"files": {
"ignore": ["node_modules/**", ".aws-sam/**"]
},
"organizeImports": {
"enabled": true
},
Expand Down
2 changes: 1 addition & 1 deletion sanitas_backend/events/event-get-all-items.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"httpMethod": "GET"
"httpMethod": "GET"
}
8 changes: 4 additions & 4 deletions sanitas_backend/events/event-get-by-id.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"httpMethod": "GET",
"pathParameters": {
"id": "id1"
}
"httpMethod": "GET",
"pathParameters": {
"id": "id1"
}
}
4 changes: 2 additions & 2 deletions sanitas_backend/events/event-post-item.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"httpMethod": "POST",
"body": "{\"id\": \"id1\",\"name\": \"name1\"}"
"httpMethod": "POST",
"body": "{\"id\": \"id1\",\"name\": \"name1\"}"
}
22 changes: 8 additions & 14 deletions sanitas_backend/jsconfig.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,10 @@
{
"compilerOptions": {
"baseUrl": ".",
"paths": {
"db-conn": [
"./layers/db-conn/db-conn/index.mjs"
],
"logging": [
"./layers/logging/logging/index.mjs"
],
"utils/*": [
"./layers/utils/utils/*"
]
}
}
"compilerOptions": {
"baseUrl": ".",
"paths": {
"db-conn": ["./layers/db-conn/db-conn/index.mjs"],
"logging": ["./layers/logging/logging/index.mjs"],
"utils/*": ["./layers/utils/utils/*"]
}
}
}
2 changes: 1 addition & 1 deletion sanitas_backend/layers/utils/utils/index.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -900,7 +900,7 @@ export function requestDataEditsDBData(requestData, dbData) {
* @param {(savedValue: *, requestValue: *) => boolean} [comparator=(a,b)=>a===b] - The array saved in the DB.
* @returns {boolean} True if the requestArray contains at minimum the same elements as the savedArray, false otherwise.
*/
export function requestIsSubset(
export function requestIsSuperset(
savedArray,
requestArray,
logger,
Expand Down
Loading

0 comments on commit 1c24955

Please sign in to comment.