fix dev to main conflicts 2 #58
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…s` (#7) * change localhost to 127.0.0.1 * Create initial migrations and updated users model * update readme
* Add a test for users get users routes * Add the testify/assert package * create api routes for google oauth * Setup google o auth * Add unique constraint to email in users model * Create function to generate jwt token * Add verify token util * Modify todo comment * Pick maxDbConnections from env, Change return type of getUserInfoFromCode to throw error * Add max db open connections to env * change utc time format to RFC3339
* Create workflow to run test on each pr * Update workflow name
* feat: docker setup for main and test DB * feat: update documentation to use local DB
* move all folder to src and create health check route * add a makefile * create docker compose for dev * wite commands for setup * ad ability to create multiple databases from docker file * update readme * update the test db url * add steps to connect to db * update spacing between images * update health check route * remove test db from docker compose
…ema (#23) * feat: migrations and struct created for form, question, option schema * refact: made chnages according to the new Schema * refact: fix forms struct and migrations * refact: change form meta data table name * refact: created form schema for form realted tables * feat: add json meta data into form structs * fix: typo in migration * refact: added updatedBy field in forms and form meta data schema * feat: change updatedById type as pointer
* feat: dtos for form create & update API * refact: suggested changes for API dtos * feat: added errorResponse Dto * refact: removed comments from dtos * feat: add docker config for postgresql * feat: draft dtos for new schema * refact: removed docker-compose and fix naming for DTOs * refact: changes suggested by @yesyash * refact: name fix for requests Dto * refact: responses dtos changes * refact: change form dtos * feat: added form meta Dto * refact: fix form dto name * fix: removed status from create form Dto * fix: added status in update form Dto * feat: make the status on update form request Dto nullable
* feat: dtos for form create & update API * refact: suggested changes for API dtos * feat: added errorResponse Dto * refact: removed comments from dtos * feat: add docker config for postgresql * feat: draft dtos for new schema * refact: removed docker-compose and fix naming for DTOs * refact: changes suggested by @yesyash * refact: name fix for requests Dto * refact: responses dtos changes * refact: change form dtos * feat: added form meta Dto * refact: fix form dto name * feat: created form Create/Read/Update APIs * fix: bugs for forms base API and API documentation * fix: testing structure fixed & forms tests written * refact: suggested changes by @yesyash * refact: suggested improvements by @prakashchoudhary07
* add logger package * creat a config package to read all env variables from * add cases for tests in core config * fix integrations tests not running on mac * add command to display env * print current dir * add a test.env file * add env to go test command * add env and verbose to test workflow * remove whitespace * add postgres to test workflow (#40) * add postgres to test workflow * revert workflow name * break unit and integration test into separate commands (#41) * createa a release docker file and update the listener port to 0.0.0.0 * create a release docker file (#42) * createa a release docker file and update the listener port to 0.0.0.0 * add comments to release docker file * take build args in the release docker file * remove build args from release docker & create a health check route * change the route group prefix from v1 to wisee/v1 (#43) * change the route group prefix from v1 to wisee/v1 * update the workflow to deploy to ecs * add new branch * reduce docker image size * chore: add platform * update go arch and goos * remove unused comment * set wait for service stability to false * add error log in health check route * add workflow dispatch * remove revision file * change trigger from dev to develop * make a get call to google.com * remove get call to google * clean up verify token function and add a issued at time (#45) * clean up verify token function and add a issued at time * change jwt validity to days from hours * make a get call to google.com * remove ping to google in health check --------- Co-authored-by: Prakash <om.pcprakash@gmail.com> --------- Co-authored-by: Prakash <om.pcprakash@gmail.com> * log jwt validity in unit tests * update dev and test env * uncommment integration tests --------- Co-authored-by: Prakash <om.pcprakash@gmail.com>
…o yash/dev-main-fix
iamitprakash
approved these changes
May 20, 2024
sahsisunny
approved these changes
May 20, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.