Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
6cf66ba
Created required empty endpoint methods for programs
Feb 13, 2020
ad1f5f7
scaffold out program controller and service
Feb 14, 2020
3a722fb
Created program unit tests.
Feb 14, 2020
456d1aa
switch to jooq <model>Entity naming
Feb 28, 2020
cf12b14
committing work in progress
Mar 2, 2020
e46a4ee
Work on program endpoints api docs
nickpalladino Mar 2, 2020
bfc6cd1
query program object with foreign objects
Mar 3, 2020
4285be7
make timestamps format correctly with jackson
Mar 3, 2020
4713cec
Work on program locations api docs
nickpalladino Mar 3, 2020
a88ba59
Changed to postgis image for databases
nickpalladino Mar 3, 2020
32c4a97
Work on add program user
nickpalladino Mar 4, 2020
74a1e44
Added optional functions into service
nickpalladino Mar 5, 2020
451d62d
progress update to program endpoints
Mar 5, 2020
2416893
added create and edit user to program endpoints
Mar 5, 2020
03c61ff
finish up program endpoints
Mar 5, 2020
410d0cf
species endpoints
Mar 5, 2020
0df017e
Added roles list and delete work
nickpalladino Mar 5, 2020
08b68a1
Add code collapse to program tests
Mar 5, 2020
bd3b77a
Make test objects dynamic
Mar 6, 2020
a951d8c
Added valid role to tests
nickpalladino Mar 6, 2020
2f0b16c
new program integration tests
Mar 6, 2020
521e2ce
Split off ProgramUserService from ProgramService
nickpalladino Mar 6, 2020
fe24c1b
fixing test breaking exception. Plus other program tests.
Mar 6, 2020
b1ede5c
Removed extraneous post programs test
nickpalladino Mar 6, 2020
bf42cf6
adding more program tests
Mar 6, 2020
a896d2e
fix broken program unit tests
Mar 9, 2020
f08b559
Update api docs for program endpoints
Mar 9, 2020
f93cb6d
program api doc touch ups. Program controller touch ups
Mar 9, 2020
cbb7751
Changing to "pluginRepository" in order for the JOOQ codegen plugin t…
timparsons Mar 9, 2020
8a4a03e
Work on PUT/GET program user endpoints
nickpalladino Mar 9, 2020
ea8abd1
Update timestamp variables to not include utc in the name
Mar 10, 2020
a7c1524
Fixed failing unit test
nickpalladino Mar 10, 2020
4648d1c
Updated api docs and added tests for get program users
nickpalladino Mar 10, 2020
ba2e0b5
updating program endpoint docs
Mar 10, 2020
0b61a9a
Added program user PUT and other tests, updated api docs
nickpalladino Mar 10, 2020
62986ce
Merge branch 'feature/PRO-42' of https://github.com/Breeding-Insight/…
nickpalladino Mar 10, 2020
9efea86
Added transaction wrappers
nickpalladino Mar 11, 2020
f9d98d6
Restructured method to be more clear
nickpalladino Mar 11, 2020
54042c0
Removing unused imports from project
Mar 16, 2020
d49ea4c
Remove unused variables from tests
Mar 16, 2020
d42c2d0
fixed some changes from pull request comments
Mar 17, 2020
8b81a9a
add unprocessable exception to program endpoints.
Mar 17, 2020
f06f605
Uncommented test case
nickpalladino Mar 17, 2020
a31ceb0
Added handling for invalid user id in post and test case
nickpalladino Mar 17, 2020
bcfc913
Fixed test case and added checks for program id
nickpalladino Mar 17, 2020
c4e0ffd
Removed inaccurate comment
nickpalladino Mar 18, 2020
714bd98
Renamed DAOs to match new naming convention
nickpalladino Mar 18, 2020
fd4d112
Make created_by and updated_by columns NOT NULL
Mar 19, 2020
5e9192c
made created_by and updated_by foreign keys in tables
Mar 19, 2020
4c66423
update get id controller request to process optionals instead of exce…
Mar 19, 2020
b76f949
Updated dsl injection
nickpalladino Mar 19, 2020
c90070f
fixes to program and species controllers
Mar 20, 2020
bf30ed6
Optional refactor program user by id
nickpalladino Mar 20, 2020
ed92e90
Optional refactor for user by id
nickpalladino Mar 20, 2020
74ac47e
Allow duplicate roles
nickpalladino Mar 20, 2020
1e590ab
User creation review action
nickpalladino Mar 23, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .env
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# NOTE: Replace your configs in here, but don't commit this up to the repo.

USER_ID=1001
GROUP_ID=1001
OAUTH_CLIENT_ID=APP-ZX6M8LSAN3YIIAQ5
USER_ID=<user id of system user>
GROUP_ID=<group id of system user>
OAUTH_CLIENT_ID=<oauth app client id>
OAUTH_CLIENT_SECRET=<ouath_client_secret goes here>
JWT_SECRET=<jwt secret goes here>
DB_PASSWORD=<database password goes here>
ADMIN_ORCID=<orcid for admin account goes here>
7 changes: 4 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,13 @@ services:
- DB_PASSWORD=${DB_PASSWORD}
- JWT_SECRET=${JWT_SECRET}
- OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET}
- ADMIN_ORCID=${ADMIN_ORCID}
ports:
- 8081:8081
networks:
- backend
bidb:
image: postgres:11.4
image: postgis/postgis:12-3.0
environment:
- POSTGRES_DB=bidb
- POSTGRES_PASSWORD=${DB_PASSWORD}
Expand All @@ -44,7 +45,7 @@ services:
aliases:
- dbserver
bitestdb:
image: postgres:11.4
image: postgis/postgis:12-3.0
environment:
- POSTGRES_DB=bitest
- POSTGRES_PASSWORD=${DB_PASSWORD}
Expand All @@ -61,4 +62,4 @@ networks:

volumes:
biapi_data:
name: biapi_data
name: biapi_data
Loading