Skip to content
This repository was archived by the owner on Mar 13, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
114 commits
Select commit Hold shift + click to select a range
0a3c163
adding in mock svc
cwdcwd May 5, 2020
ba99e94
Update with the latest swagger specification
callmekatootie May 6, 2020
3486eb2
enable cors
callmekatootie May 13, 2020
2717d64
Implement API using QLDB
callmekatootie May 20, 2020
4158df1
making version dynamic from env vars
cwdcwd May 21, 2020
0d9ad99
Add /health endpoint for health check
callmekatootie May 28, 2020
6c2e4df
Integrate elasticsearch
callmekatootie May 31, 2020
ef984b3
Update dev data insertion and deletion scripts to also insert and del…
callmekatootie Jun 1, 2020
81a7e15
Fix issues with helper scripts
callmekatootie Jun 1, 2020
d2d5669
Merge branch 'develop' of github.com:topcoder-platform/u-bahn-api int…
callmekatootie Jun 1, 2020
d71d59f
Fix wrongly referenced configuration
callmekatootie Jun 2, 2020
5b0bdda
Fix issue where elasticsearch connected to AWS throws credential errors
callmekatootie Jun 2, 2020
ac2e779
Fix issue where tonyj was not administrator
callmekatootie Jun 2, 2020
7d2cad8
Fix issue where elasticsearch connection would fail
callmekatootie Jun 2, 2020
77aea22
Fix issues reported by reviewer
callmekatootie Jun 3, 2020
a2ed8c1
Fix issue where deleted record event would not be published to bus api
callmekatootie Jun 4, 2020
f2a1c17
Delete data script should clear data instead of dropping tables becau…
callmekatootie Jun 5, 2020
0d2f1c5
Support first name and last name for users and provide mock data for …
callmekatootie Jun 6, 2020
d4a7263
Support location, availability, skills and achievement filters needed…
callmekatootie Jun 6, 2020
c93484d
Fix issue where filter using skills or achievements for enriched user…
callmekatootie Jun 6, 2020
3a9a6e8
Support sorting of data by location, name and availability
callmekatootie Jun 7, 2020
e783309
Update dummy data for filtering skills and achievements
callmekatootie Jun 7, 2020
36859ec
Update swagger specification for the new query params
callmekatootie Jun 7, 2020
9cc73ea
Fix pagination header value
callmekatootie Jun 7, 2020
83346a6
Improve error message
callmekatootie Jun 9, 2020
006ec0f
Fix issue where deleting junction table record would not publish the …
callmekatootie Jun 9, 2020
e11d2e9
Support querying skills using externalId and skillProviderId
callmekatootie Jun 9, 2020
7228492
Add tonyj user for org mapping
callmekatootie Jun 10, 2020
1ff41d7
Create endpoints to search for users and to search for attribute values
callmekatootie Jun 10, 2020
7e62571
Correct the name used
callmekatootie Jun 10, 2020
5f0573c
New attribute externalId on external profile model
callmekatootie Jun 10, 2020
1830dbe
New endpoints - /search/users and /search/userAttributes
callmekatootie Jun 11, 2020
74ff310
Fix issue where searching external profiles by external id not working
callmekatootie Jun 11, 2020
bfd634b
Merge pull request #10 from topcoder-platform/t
callmekatootie Jun 11, 2020
e754e04
Setup data for company attributes
callmekatootie Jun 11, 2020
07ae64b
Update query params passed to endpoint to get groups for user
callmekatootie Jun 13, 2020
7faabda
Return empty groups if group api fails
callmekatootie Jun 13, 2020
c2a2f5b
Fix issue where users groups were not being returned
callmekatootie Jun 13, 2020
e270d2d
Support keyword search
callmekatootie Jun 14, 2020
b8ffc27
Update mock data
callmekatootie Jun 15, 2020
bb44d9f
#12 - Fix issue where invalid model attributes did not raise validati…
callmekatootie Jun 15, 2020
c65f710
Revert "#12 - Fix issue where invalid model attributes did not raise …
callmekatootie Jun 15, 2020
3b9e573
Fix pagination issue where x-total header did not display total records
callmekatootie Jun 15, 2020
60d368d
Merge branch 'develop' into health-check
callmekatootie Jun 16, 2020
c4819e7
Merge pull request #14 from topcoder-platform/health-check
callmekatootie Jun 16, 2020
5b5ea93
Update endpoint for deployment based on gunasekarks suggestion
callmekatootie Jun 16, 2020
d4340f1
Only return unique values for attribute value lookups
callmekatootie Jun 16, 2020
c6b8f06
Update keyword search to be a substring search instead of exact match…
callmekatootie Jun 18, 2020
aa9150a
Revert "Update keyword search to be a substring search instead of exa…
callmekatootie Jun 18, 2020
f27d6f6
Update keyword search to be a substring search instead of exact match…
callmekatootie Jun 18, 2020
1b5e94e
circleci integration
Gunasekar-K Jun 19, 2020
5c873b9
Use aggregation query to return unique attribute values for lookup
callmekatootie Jun 22, 2020
fd2daf9
Provide filter by organizationId
callmekatootie Jun 22, 2020
cb1458c
#12 - Fix issue where payloads would not be validated. Also, support …
callmekatootie Jun 28, 2020
2787856
Delete index before creating
callmekatootie Jun 29, 2020
2177a7c
undo previous commit due to error in inserting data for sub resources
callmekatootie Jun 29, 2020
355015f
Trigger heroku deploy
callmekatootie Jun 29, 2020
9b4b224
Update joi validations to match UI needs
callmekatootie Jun 29, 2020
99ac1b2
Merge pull request #15 from topcoder-platform/develop_latest
Gunasekar-K Jun 30, 2020
399d488
AWS deployment
Gunasekar-K Jun 30, 2020
6adf6a4
Update config.yml
Gunasekar-K Jun 30, 2020
42f145f
indent issue
Gunasekar-K Jun 30, 2020
f5c5ac9
indent issue
Gunasekar-K Jun 30, 2020
0812bc7
indent issue
Gunasekar-K Jun 30, 2020
865aad8
Allow u-bahn role users to perform almost same actions as admin, exce…
callmekatootie Jul 1, 2020
a8e011f
Update validations to support bulk processor
callmekatootie Jul 1, 2020
e3bf845
Fix auth0 issue
callmekatootie Jul 2, 2020
581bba5
Merge branch 'develop' of github.com:topcoder-platform/u-bahn-api int…
callmekatootie Jul 2, 2020
d493bfb
Correct optional property on external profile model
callmekatootie Jul 3, 2020
6774967
Merge pull request #16 from topcoder-platform/ubahn_role
callmekatootie Jul 6, 2020
68fedba
Force user to pass org details when multiple orgs are associated with…
callmekatootie Jul 8, 2020
6f25ca3
For searching data in ES, pass the org id if present when constructin…
callmekatootie Jul 8, 2020
b0b3d32
Moved clearing db to after clearing ES since clearing db could someti…
callmekatootie Jul 10, 2020
13685dc
Bump lodash from 4.17.15 to 4.17.19
dependabot[bot] Jul 21, 2020
4776f80
Fixes u-bahn-app #295: unescaping URI encoded querystring and no long…
rakibansary Jul 27, 2020
1b8174d
Fixes u-bahn-app #295: unescaping URI encoded querystring and no long…
rakibansary Jul 27, 2020
2853a7a
Escape reserved regex characters. Fixes #295
rakibansary Jul 27, 2020
6f18893
Merge pull request #18 from ansaryfantastic/develop
callmekatootie Jul 27, 2020
c577cfa
Merge pull request #17 from topcoder-platform/dependabot/npm_and_yarn…
callmekatootie Jul 28, 2020
e4dc8b8
https://github.com/topcoder-platform/u-bahn-app/issues/295 - Fix issu…
callmekatootie Jul 28, 2020
ac33532
Merge branch 'develop' of github.com:topcoder-platform/u-bahn-api int…
callmekatootie Jul 28, 2020
68457f3
https://github.com/topcoder-platform/u-bahn-app/issues/295 - Fix issu…
callmekatootie Jul 28, 2020
3b927aa
Revert "https://github.com/topcoder-platform/u-bahn-app/issues/295 - …
callmekatootie Jul 28, 2020
6ba8ade
Revert "https://github.com/topcoder-platform/u-bahn-app/issues/295 - …
callmekatootie Jul 28, 2020
760c052
Escape reserved regex characters when querying attribute value. Fixes…
rakibansary Jul 28, 2020
8604c99
Merge pull request #20 from ansaryfantastic/develop
callmekatootie Jul 28, 2020
5e34f06
Fixes u-bahn-app #487
rakibansary Jul 28, 2020
5a8b326
Merge pull request #21 from ansaryfantastic/develop
callmekatootie Jul 28, 2020
ecae1e8
Fixes u-bahn-app #237
rakibansary Jul 28, 2020
4b602b9
Fixes u-bahn-app #237
rakibansary Jul 28, 2020
9bf182e
Merge pull request #22 from ansaryfantastic/develop
callmekatootie Jul 28, 2020
0d2de55
#24 - Link skill provider with org
callmekatootie Aug 2, 2020
5e38832
#24 - Scrap individual service and controller for org skill provider …
callmekatootie Aug 2, 2020
778d20c
#24 - uncomment table creation
callmekatootie Aug 2, 2020
ac95a77
Merge pull request #1 from topcoder-platform/develop
rakibansary Aug 2, 2020
626a1dc
Search achievements by organization ID and keyword
rakibansary Aug 2, 2020
56e0ef7
Include achievementId in response
rakibansary Aug 2, 2020
e6f6ac6
Merge pull request #25 from ansaryfantastic/develop
callmekatootie Aug 2, 2020
845f92d
Merge pull request #2 from topcoder-platform/develop
rakibansary Aug 3, 2020
8d21bad
API to searchs kills associated with an organization
rakibansary Aug 3, 2020
67f6084
Merge pull request #26 from ansaryfantastic/develop
callmekatootie Aug 3, 2020
f15e796
Fix syntax error
callmekatootie Aug 3, 2020
9a91748
Include search/skills endpoint
rakibansary Aug 3, 2020
b6125dc
Extract skillProviderId instead of skill.id
rakibansary Aug 3, 2020
5f2171a
Merge pull request #27 from ansaryfantastic/develop
callmekatootie Aug 3, 2020
97f0ab4
#29 - Proxy to EMSI if the org use EMSI as skill provider
callmekatootie Aug 4, 2020
4de5009
Merge branch 'develop' of github.com:topcoder-platform/u-bahn-api int…
callmekatootie Aug 4, 2020
bedfd3f
ExternalId for skill cannot be a required field because in some scena…
callmekatootie Aug 4, 2020
9ab4681
Fix issue where we could not create skills with different name
callmekatootie Aug 4, 2020
fadd8d0
Misc
callmekatootie Aug 6, 2020
2d9ca31
Merge branch 'master' into ubahn_role
callmekatootie Aug 6, 2020
db7a856
#31 - Support non admin roles
callmekatootie Aug 6, 2020
4ed79d8
Merge branch 'develop' into ubahn_role
callmekatootie Aug 6, 2020
2a6d709
#31 - Support non admin roles for search endpoints
callmekatootie Aug 6, 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
80 changes: 80 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
version: 2
defaults: &defaults
docker:
- image: circleci/python:2.7.18-stretch-browsers
install_dependency: &install_dependency
name: Installation of build and deployment dependencies.
command: |
sudo apt install jq
sudo pip install awscli --upgrade
sudo pip install docker-compose
install_deploysuite: &install_deploysuite
name: Installation of install_deploysuite.
command: |
git clone --branch v1.4.2 https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
cp ./../buildscript/master_deploy.sh .
cp ./../buildscript/buildenv.sh .
cp ./../buildscript/awsconfiguration.sh .
restore_cache_settings_for_build: &restore_cache_settings_for_build
key: docker-node-modules-{{ checksum "package-lock.json" }}

save_cache_settings: &save_cache_settings
key: docker-node-modules-{{ checksum "package-lock.json" }}
paths:
- node_modules

builddeploy_steps: &builddeploy_steps
- checkout
- setup_remote_docker
- run: *install_dependency
- run: *install_deploysuite
- restore_cache: *restore_cache_settings_for_build
- run: ./build.sh ${APPNAME}
- save_cache: *save_cache_settings
- deploy:
name: Running MasterScript.
command: |
./awsconfiguration.sh $DEPLOY_ENV
source awsenvconf
./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-${APPNAME}-deployvar
source buildenvvar
./master_deploy.sh -d ECS -e $DEPLOY_ENV -t latest -s ${LOGICAL_ENV}-global-appvar,${LOGICAL_ENV}-${APPNAME}-appvar -i ${APPNAME}


jobs:
# Build & Deploy against development backend
"build-dev":
<<: *defaults
environment:
DEPLOY_ENV: "DEV"
LOGICAL_ENV: "dev"
APPNAME: "ubahn_api"
steps: *builddeploy_steps

"build-prod":
<<: *defaults
environment:
DEPLOY_ENV: "PROD"
LOGICAL_ENV: "prod"
APPNAME: "ubahn_api"
steps: *builddeploy_steps

workflows:
version: 2
build:
jobs:
# Development builds are executed on "develop" branch only.
- "build-dev":
context : org-global
filters:
branches:
only:
- develop

# Production builds are exectuted only on tagged commits to the
# master branch.
- "build-prod":
context : org-global
filters:
branches:
only: master
5 changes: 5 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
node_modules
.idea
**/.DS_Store
.env
coverage
108 changes: 6 additions & 102 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,104 +1,8 @@
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
lerna-debug.log*

# Diagnostic reports (https://nodejs.org/api/report.html)
report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json

# Runtime data
pids
*.pid
*.seed
*.pid.lock

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage
*.lcov

# nyc test coverage
node_modules
.idea
**/.DS_Store
upload
scripts/generate
.nyc_output

# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# Bower dependency directory (https://bower.io/)
bower_components

# node-waf configuration
.lock-wscript

# Compiled binary addons (https://nodejs.org/api/addons.html)
build/Release

# Dependency directories
node_modules/
jspm_packages/

# TypeScript v1 declaration files
typings/

# TypeScript cache
*.tsbuildinfo

# Optional npm cache directory
.npm

# Optional eslint cache
.eslintcache

# Microbundle cache
.rpt2_cache/
.rts2_cache_cjs/
.rts2_cache_es/
.rts2_cache_umd/

# Optional REPL history
.node_repl_history

# Output of 'npm pack'
*.tgz

# Yarn Integrity file
.yarn-integrity

# dotenv environment variables file
.env
.env.test

# parcel-bundler cache (https://parceljs.org/)
.cache

# Next.js build output
.next

# Nuxt.js build / generate output
.nuxt
dist

# Gatsby files
.cache/
# Comment in the public line in if your project uses Gatsby and *not* Next.js
# https://nextjs.org/blog/next-9-1#public-directory-support
# public

# vuepress build output
.vuepress/dist

# Serverless directories
.serverless/

# FuseBox cache
.fusebox/

# DynamoDB Local files
.dynamodb/

# TernJS port file
.tern-port
coverage
10 changes: 10 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
FROM node:12
WORKDIR /usr/src/app
COPY package.json ./
COPY app.js ./
COPY ./src ./src
COPY ./config ./config
COPY ./scripts ./scripts

RUN npm install
ENTRYPOINT [ "node", "app.js" ]
Loading