Skip to content

Commit

Permalink
Submission Feature Migrations and Test Seeding
Browse files Browse the repository at this point in the history
Remove DB_SCHEMA usage in most places.
Remove DB Views
Add Mock test data seed (disabled by default)
  • Loading branch information
NickPhura committed Nov 15, 2023
1 parent 8b1bcc8 commit 46daa6e
Show file tree
Hide file tree
Showing 22 changed files with 1,230 additions and 170 deletions.
8 changes: 8 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,14 @@ clean: ## Closes and cleans (removes) all project containers
@echo "==============================================="
@docker-compose -f docker-compose.yml down -v --rmi all --remove-orphans

prune: ## Deletes ALL docker artifacts (even those not associated to this project)
@echo -n "Delete ALL docker artifacts? [y/n] " && read ans && [ $${ans:-n} = y ]
@echo "==============================================="
@echo "Make: prune - deleting all docker artifacts"
@echo "==============================================="
@docker system prune --all --volumes -f
@docker volume prune --all -f

## ------------------------------------------------------------------------------
## Build/Run Postgres DB Commands
## - Builds all of the BioHub postgres db projects (db, db_setup)
Expand Down
121 changes: 28 additions & 93 deletions api/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions database/.eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,15 @@
"@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/explicit-module-boundary-types": "off",
"@typescript-eslint/ban-types": ["error", { "types": { "object": false, "extendDefaults": true } }],
"@typescript-eslint/ban-ts-comment": [
"error",
{
"ts-expect-error": false,
"ts-ignore": false,
"ts-nocheck": false,
"ts-check": false
}
],
"no-var": "error"
}
}
1 change: 0 additions & 1 deletion database/.pipeline/lib/db.setup.deploy.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ const dbSetupDeploy = async (settings) => {
NODE_ENV: phases[phase].env || 'dev',
DB_SERVICE_NAME: dbName,
DB_SCHEMA: 'biohub',
DB_SCHEMA_DAPI_V1: 'biohub_dapi_v1',
IMAGE: dbSetupImageStream.image.dockerImageReference
}
})
Expand Down
5 changes: 0 additions & 5 deletions database/.pipeline/templates/db.setup.dc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@ parameters:
- name: DB_SCHEMA
description: 'Database schema'
required: true
- name: DB_SCHEMA_DAPI_V1
description: 'Database api v1 schema'
required: true
- name: NODE_ENV
description: Application Environment type variable
required: true
Expand Down Expand Up @@ -96,8 +93,6 @@ objects:
value: ${VERSION}
- name: DB_SCHEMA
value: ${DB_SCHEMA}
- name: DB_SCHEMA_DAPI_V1
value: ${DB_SCHEMA_DAPI_V1}
imagePullPolicy: Always
restartPolicy: Never
activeDeadlineSeconds: 900
Expand Down
Loading

0 comments on commit 46daa6e

Please sign in to comment.