Skip to content
This repository was archived by the owner on Oct 15, 2025. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3439 commits
Select commit Hold shift + click to select a range
14ea1be
line indents
elizabeth-jimenez Nov 30, 2022
43ecb13
indentation
elizabeth-jimenez Nov 30, 2022
917e25d
asg and bids languages
elizabeth-jimenez Nov 30, 2022
7883bfc
assignment languages added
elizabeth-jimenez Dec 1, 2022
928fab1
cleanup
elizabeth-jimenez Dec 1, 2022
5c70ca5
check on value instead of key
elizabeth-jimenez Dec 1, 2022
53f8e2c
false check
elizabeth-jimenez Dec 2, 2022
6957c6c
Update urls to include api/v1
scott062 Dec 2, 2022
dab5e33
passing in position node for assignment call
elizabeth-jimenez Dec 2, 2022
c8df799
grabbing correct subset
elizabeth-jimenez Dec 2, 2022
301dd9c
passing correct lang data
elizabeth-jimenez Dec 2, 2022
b086a8c
grabbing right data from v2 positions
elizabeth-jimenez Dec 2, 2022
a9a6647
Update assignment_history.py
elizabeth-jimenez Dec 2, 2022
3323b04
Merge pull request #728 from MetaPhase-Consulting/update/ai-pos-lang
elizabeth-jimenez Dec 5, 2022
de46316
Merge branch 'dev' into update/sso-url-changes
scott062 Dec 5, 2022
b2a01f4
mapping for creators and updaters
elizabeth-jimenez Dec 5, 2022
3349c34
creator and updaters from arr to obj
elizabeth-jimenez Dec 5, 2022
b4ecdc2
Add env variables for new resource
scott062 Dec 6, 2022
38fa16a
Add urls for capsule description
scott062 Dec 6, 2022
206969e
Merge pull request #730 from MetaPhase-Consulting/update/map-creators…
elizabeth-jimenez Dec 6, 2022
df43e52
Add get capsule functionality
scott062 Dec 6, 2022
1142bd6
Create two views for GET and PATCH
scott062 Dec 6, 2022
b4e4dbe
Merge branch 'dev' into feature/edit-capsule
scott062 Dec 6, 2022
89cf3db
handling an empty array
elizabeth-jimenez Dec 7, 2022
2f69f57
Merge pull request #731 from MetaPhase-Consulting/feature/edit-capsule
scott062 Dec 7, 2022
1e11ee2
Merge branch 'dev' into fix/empty-creators-updaters
SidelineCory24 Dec 7, 2022
7705ab3
Merge pull request #732 from MetaPhase-Consulting/fix/empty-creators-…
elizabeth-jimenez Dec 7, 2022
f7a4aea
handling empty empUser
elizabeth-jimenez Dec 7, 2022
c894a91
Merge pull request #733 from MetaPhase-Consulting/fix/handle-empty-em…
elizabeth-jimenez Dec 7, 2022
82823ed
proper typcasting
elizabeth-jimenez Dec 8, 2022
ed98433
debugging build
pveland621 Dec 20, 2022
0bc28b6
handling bad fp data
SidelineCory24 Dec 21, 2022
d52ed9e
endpoint working with mock
pveland621 Dec 21, 2022
83c7e05
cleaning up
pveland621 Dec 21, 2022
c329132
Merge branch 'dev' into update/agendas-by-panel-date
pveland621 Dec 21, 2022
70584dc
Merge pull request #736 from MetaPhase-Consulting/fix/fp-data-handling
scott062 Dec 21, 2022
ba5d67c
Merge branch 'dev' into update/agendas-by-panel-date
pveland621 Dec 21, 2022
d935824
Merge pull request #735 from MetaPhase-Consulting/update/agendas-by-p…
scott062 Dec 21, 2022
0d5d747
Merge branch 'dev' into update/sso-url-changes
scott062 Jan 3, 2023
8a24fb8
cleanup and optimization
elizabeth-jimenez Jan 9, 2023
1664ae0
plural agendas text
elizabeth-jimenez Jan 9, 2023
855f0f4
organizing urls
elizabeth-jimenez Jan 9, 2023
40cbbfc
Merge branch 'dev' into fix/creators-updaters
elizabeth-jimenez Jan 10, 2023
cf3e3f6
Merge pull request #734 from MetaPhase-Consulting/fix/creators-updaters
elizabeth-jimenez Jan 10, 2023
ec07cf5
Merge branch 'dev' into update/sso-url-changes
elizabeth-jimenez Jan 10, 2023
634093b
Merge pull request #729 from MetaPhase-Consulting/update/sso-url-changes
scott062 Jan 10, 2023
0acaceb
pushing to new branch
elizabeth-jimenez Jan 10, 2023
b66fbbb
Merge branch 'update/organizing-optimizing' into update/panel-meetings
elizabeth-jimenez Jan 10, 2023
fdcf7a3
panel meetings EP
elizabeth-jimenez Jan 10, 2023
c11e10e
9.1.0
elizabeth-jimenez Jan 10, 2023
aefc6a2
Merge pull request #741 from MetaPhase-Consulting/update/tm-version
scott062 Jan 10, 2023
193b38c
Setup dynamic remoteMetadata lookup
scott062 Jan 11, 2023
12b8699
Merge branch 'dev' into fix/dynamic-remote-metadata
scott062 Jan 11, 2023
4bc7087
Merge pull request #743 from MetaPhase-Consulting/fix/dynamic-remote-…
elizabeth-jimenez Jan 11, 2023
f8edf0e
adding support for split name search
pveland621 Jan 12, 2023
9fc5093
changing emp ID to EQ instead of CONTAINS
pveland621 Jan 17, 2023
764babb
Merge branch 'dev' into update/eas-name-search
pveland621 Jan 17, 2023
79d3057
Merge pull request #744 from MetaPhase-Consulting/update/eas-name-search
elizabeth-jimenez Jan 17, 2023
940dfa8
adding back .upper functionality
pveland621 Jan 18, 2023
4357f2a
optimizing
pveland621 Jan 18, 2023
7eed3ab
Merge pull request #745 from MetaPhase-Consulting/fix/eas-split-search
elizabeth-jimenez Jan 18, 2023
e8ed6c0
Merge branch 'dev' into update/panel-meetings
elizabeth-jimenez Jan 19, 2023
ccc8293
TM Panel Statuses and Types EP setup
elizabeth-jimenez Jan 23, 2023
4f1afb4
Merge branch 'update/panel-meetings' of https://github.com/MetaPhase-…
elizabeth-jimenez Jan 23, 2023
8d3800c
merge conflict resolution
elizabeth-jimenez Jan 23, 2023
8463970
adding check for inactiveIsSelected
pveland621 Jan 23, 2023
54e22e3
cleaning up
pveland621 Jan 23, 2023
8767382
adding report category & panel date type TM-3929
SidelineCory24 Jan 24, 2023
9c284f7
returning panel meeting seqnum
SidelineCory24 Jan 25, 2023
b091a12
optimized mapping and fsbid/panel/meetings completed
elizabeth-jimenez Jan 25, 2023
bf5d297
fsbid/panel/dates transitioned to new mapping
elizabeth-jimenez Jan 25, 2023
2a5a890
panel statuses, types, and categories to new mapping
elizabeth-jimenez Jan 25, 2023
9030853
Merge branch 'dev' into update/organizing-optimizing
elizabeth-jimenez Jan 25, 2023
688918f
cleanup
elizabeth-jimenez Jan 25, 2023
f60959f
Update panel.py
elizabeth-jimenez Jan 25, 2023
7f28dfb
reference urls to include reference in name
elizabeth-jimenez Jan 26, 2023
013b277
None handling
elizabeth-jimenez Jan 26, 2023
71f238b
addressing feedback
pveland621 Jan 26, 2023
5dba92d
changing variable name
pveland621 Jan 26, 2023
f1e8681
Merge pull request #746 from MetaPhase-Consulting/feature/eas-inactiv…
elizabeth-jimenez Jan 26, 2023
81f1f0b
different mapping for refs
elizabeth-jimenez Jan 27, 2023
d4f94c4
mapping update
elizabeth-jimenez Jan 27, 2023
4c33c5a
Merge branch 'dev' into update/aim-panel-meeting-type
SidelineCory24 Jan 30, 2023
2a49444
Merge branch 'dev' into update/organizing-optimizing
elizabeth-jimenez Jan 30, 2023
1dcde01
Update permissions for user/permission endpoint
scott062 Feb 2, 2023
a5b37da
Update test to ensure it fails
scott062 Feb 2, 2023
7254625
Merge branch 'dev' into update/panel-meetings
SidelineCory24 Feb 2, 2023
b2bb5a8
Merge pull request #748 from MetaPhase-Consulting/update/permissions-ep
scott062 Feb 3, 2023
d2ff078
Merge branch 'dev' into update/organizing-optimizing
elizabeth-jimenez Feb 3, 2023
41b536f
Merge pull request #739 from MetaPhase-Consulting/update/organizing-o…
elizabeth-jimenez Feb 3, 2023
6a662b0
Merge branch 'dev' into update/panel-meetings
elizabeth-jimenez Feb 3, 2023
fe074cd
indenting after merge conflicts resolution
elizabeth-jimenez Feb 3, 2023
0554305
or None instead of None default
elizabeth-jimenez Feb 3, 2023
ceca158
Merge branch 'dev' into update/aim-panel-meeting-type
SidelineCory24 Feb 3, 2023
f598cab
handling None from pydash.get
SidelineCory24 Feb 3, 2023
42fbad1
Merge pull request #740 from MetaPhase-Consulting/update/panel-meetings
elizabeth-jimenez Feb 6, 2023
252e96c
IN for Panel filters
elizabeth-jimenez Feb 6, 2023
39a3b15
Update panel.py
elizabeth-jimenez Feb 6, 2023
97d4b2f
more dbl to single quotes
elizabeth-jimenez Feb 6, 2023
2259145
Merge pull request #749 from MetaPhase-Consulting/fix/handle-multiple…
elizabeth-jimenez Feb 6, 2023
1f8497d
Merge branch 'dev' into update/aim-panel-meeting-type
SidelineCory24 Feb 7, 2023
5018e94
changing filters to match new WS fields
pveland621 Feb 7, 2023
64ed1e0
Merge branch 'dev' into update/eas-name-search-split
pveland621 Feb 7, 2023
4a87656
adding back 'or none' and refactoring variables with none default
pveland621 Feb 8, 2023
6c98c15
categorizing meetings
elizabeth-jimenez Feb 9, 2023
56519b3
panel meeting sorts
elizabeth-jimenez Feb 9, 2023
b0a7324
undoing categorizing
elizabeth-jimenez Feb 9, 2023
1868f2c
Merge pull request #753 from MetaPhase-Consulting/update/panel-meetin…
SidelineCory24 Feb 9, 2023
de7b656
Merge branch 'dev' into update/eas-name-search-split
pveland621 Feb 9, 2023
6db3ada
Merge pull request #750 from MetaPhase-Consulting/update/eas-name-sea…
pveland621 Feb 10, 2023
6e576eb
Merge branch 'dev' into update/aim-panel-meeting-type
SidelineCory24 Feb 12, 2023
956cb06
Merge pull request #747 from MetaPhase-Consulting/update/aim-panel-me…
SidelineCory24 Feb 12, 2023
aff0288
Merge branch 'dev' into feature/panel-meeting-sections
elizabeth-jimenez Feb 13, 2023
f8552db
Merge pull request #752 from MetaPhase-Consulting/feature/panel-meeti…
elizabeth-jimenez Feb 13, 2023
f48c368
adding ailseqnum to ai legs
SidelineCory24 Feb 14, 2023
446fd00
Merge pull request #754 from MetaPhase-Consulting/update/aim-initial-…
SidelineCory24 Feb 14, 2023
806a5bf
mapping pmiOIN and hard-coding sort
elizabeth-jimenez Feb 16, 2023
b065639
initial setup
pveland621 Feb 16, 2023
0eb9791
more debugging
pveland621 Feb 17, 2023
15f05c8
csv function for templates
elizabeth-jimenez Feb 17, 2023
6dd3981
mapping function for panel dates
elizabeth-jimenez Feb 21, 2023
9561456
cleanup
elizabeth-jimenez Feb 21, 2023
52d8424
Update panel.py
elizabeth-jimenez Feb 21, 2023
8177e99
documentation
elizabeth-jimenez Feb 21, 2023
6f7764c
Merge branch 'update/csv-for-templates' of https://github.com/MetaPha…
elizabeth-jimenez Feb 21, 2023
8ab1941
Update common.py
elizabeth-jimenez Feb 21, 2023
c83f1d2
adding skill & location to assign hist
SidelineCory24 Feb 21, 2023
3aa558e
working build
pveland621 Feb 22, 2023
f188cb7
cleaning up
pveland621 Feb 22, 2023
8f16fdc
removing unnecessary variables
pveland621 Feb 22, 2023
481b1dc
removing unnecessary variables
pveland621 Feb 22, 2023
b47392e
removing creator/modifier remarks
pveland621 Feb 23, 2023
876e442
debugging dms weirdness
pveland621 Feb 23, 2023
43dd06a
Merge pull request #757 from MetaPhase-Consulting/feature/pmi-officia…
elizabeth-jimenez Feb 23, 2023
4443895
transition to pydash get
elizabeth-jimenez Feb 23, 2023
28cd5ee
Merge branch 'dev' into update/csv-for-templates
elizabeth-jimenez Feb 23, 2023
a47c094
Merge branch 'staging' into update/permissions-ep
scott062 Feb 24, 2023
b556243
Merge pull request #547 from MetaPhase-Consulting/update/permissions-ep
kakumanipk Feb 24, 2023
9b50dc6
Merge branch 'dev' into update/enhance-assign-hist-data-aim
SidelineCory24 Feb 24, 2023
b448841
typo fix
SidelineCory24 Feb 24, 2023
c9e13c6
changing fallback handling
SidelineCory24 Feb 24, 2023
eddeac9
removing unneed or None
SidelineCory24 Feb 24, 2023
d27499f
updating to or None where possible
SidelineCory24 Feb 24, 2023
82b2365
Merge pull request #761 from MetaPhase-Consulting/update/pydash-get
elizabeth-jimenez Feb 24, 2023
8abb536
addressing feedback
pveland621 Feb 24, 2023
fcf1676
Merge branch 'dev' into update/agenda-real-remarks
pveland621 Feb 24, 2023
5b68c49
Merge branch 'dev' into update/enhance-assign-hist-data-aim
SidelineCory24 Feb 24, 2023
401a5f4
Merge branch 'dev' into update/csv-for-templates
elizabeth-jimenez Feb 24, 2023
b94c154
Merge pull request #759 from MetaPhase-Consulting/update/enhance-assi…
SidelineCory24 Feb 24, 2023
1eeb4e0
Merge branch 'dev' into update/csv-for-templates
elizabeth-jimenez Feb 24, 2023
bc1373a
addressing feedback
pveland621 Feb 24, 2023
d017175
Merge branch 'dev' into update/panel-meetings-export
pveland621 Feb 24, 2023
14f645f
Merge branch 'dev' into update/agenda-real-remarks
pveland621 Feb 24, 2023
3d7b911
thanks scott
elizabeth-jimenez Feb 27, 2023
5d718a7
initial debugging
pveland621 Feb 27, 2023
144bc5d
panel meeting search pagination TM-4024
SidelineCory24 Feb 27, 2023
832cdd5
addressing feedback
pveland621 Feb 27, 2023
a7bab95
adding pydash to pmddttm
pveland621 Feb 27, 2023
41a183a
testing cleanup
SidelineCory24 Feb 27, 2023
b13d12c
initial debugging
pveland621 Feb 27, 2023
383b076
updating view deascription and adding try except block to for loop
pveland621 Feb 27, 2023
ac191a0
merge conflicts
pveland621 Feb 27, 2023
d5444fe
Merge pull request #758 from MetaPhase-Consulting/update/csv-for-temp…
elizabeth-jimenez Feb 27, 2023
9220344
Merge branch 'dev' into update/panel-meeting-search-pagination
SidelineCory24 Feb 27, 2023
d0ccb4e
setting up new parse_agenda_remarks
pveland621 Feb 28, 2023
b4649e9
addressing last feedback
pveland621 Feb 28, 2023
89d169c
Merge branch 'dev' into update/panel-meetings-export
pveland621 Feb 28, 2023
06397d4
Merge pull request #756 from MetaPhase-Consulting/update/panel-meetin…
pveland621 Feb 28, 2023
6ab2ea6
Merge branch 'dev' into update/panel-meeting-search-pagination
SidelineCory24 Feb 28, 2023
0b8f6e1
Merge pull request #762 from MetaPhase-Consulting/update/panel-meetin…
SidelineCory24 Feb 28, 2023
2cbda08
Fetch client data on each agenda item mapping
scott062 Feb 28, 2023
af58bf3
Merge branch 'dev' into update/user-data-per-agenda
scott062 Feb 28, 2023
836fda5
decreasing export limit to 1000
pveland621 Feb 28, 2023
72815fe
Merge pull request #764 from MetaPhase-Consulting/fix/pm-export-limit
elizabeth-jimenez Feb 28, 2023
bb7ad79
Merge branch 'dev' into update/user-data-per-agenda
scott062 Feb 28, 2023
d5cb6a8
Merge pull request #763 from MetaPhase-Consulting/update/user-data-pe…
scott062 Mar 1, 2023
80908d1
Fail elegantly with no jwt
scott062 Mar 1, 2023
6688b82
Cleanup
scott062 Mar 1, 2023
3ecd8bc
Elizabeth's fix
scott062 Mar 1, 2023
200ac82
working build
pveland621 Mar 1, 2023
9a24746
Merge pull request #765 from MetaPhase-Consulting/fix/client-pma-mapping
scott062 Mar 1, 2023
a18e090
updating fallback for new remarks structure
pveland621 Mar 2, 2023
e9eb058
Merge branch 'dev' into update/agenda-real-remarks
elizabeth-jimenez Mar 3, 2023
e4e9f40
adding remarks for single AI
elizabeth-jimenez Mar 3, 2023
5a47d9f
Update common.py
elizabeth-jimenez Mar 3, 2023
7e77054
Wrap index error in try
scott062 Mar 6, 2023
f196f87
More specific error for linter
scott062 Mar 6, 2023
875d966
export agendas by panel meeting
pveland621 Mar 6, 2023
73d7fd4
updating filters and sort
elizabeth-jimenez Mar 7, 2023
cf6a4bc
Update common.py
elizabeth-jimenez Mar 7, 2023
3d74d37
working build using fsbid mapping function and new ref data. still ne…
pveland621 Mar 8, 2023
f46f850
partial cleanup
pveland621 Mar 8, 2023
322bb38
more cleanup
pveland621 Mar 8, 2023
5943172
Merge pull request #766 from MetaPhase-Consulting/fix/index-error-client
SidelineCory24 Mar 8, 2023
6ba2df9
adding lambda functions for pos number and grade
pveland621 Mar 8, 2023
0e3d02f
changing url to match agendas format
pveland621 Mar 8, 2023
37b0cbc
Merge branch 'dev' into update/pma-export
pveland621 Mar 8, 2023
ad431b6
Merge branch 'dev' into update/pm-filter-sort-default
elizabeth-jimenez Mar 8, 2023
f3ffc94
updating view description
pveland621 Mar 9, 2023
b8fc691
Merge branch 'update/pma-export' of https://github.com/MetaPhase-Cons…
pveland621 Mar 9, 2023
370ebe8
Merge pull request #767 from MetaPhase-Consulting/update/pma-export
pveland621 Mar 9, 2023
1c2798e
sorting and filtering by panel date
elizabeth-jimenez Mar 9, 2023
1e3d510
Update panel.py
elizabeth-jimenez Mar 9, 2023
cd85a96
adding fallback for date processing function
pveland621 Mar 9, 2023
9536a1e
Merge pull request #770 from MetaPhase-Consulting/fix/pma-export
pveland621 Mar 9, 2023
c3fced9
Merge branch 'dev' into update/pm-filter-sort-default
elizabeth-jimenez Mar 9, 2023
fa728a2
TM-4030, return dates for agenda items
Mar 10, 2023
8055fa2
Merge branch 'dev' into TM-4030_create_update_date_ai
M00staff Mar 10, 2023
3f8c9bc
adding fallback if no match is found for an insertion
pveland621 Mar 10, 2023
4a4a7ed
cleaning up unnecessary remarks
pveland621 Mar 10, 2023
0ae01a4
cleaning up
pveland621 Mar 10, 2023
b504e7b
removing partial calls
pveland621 Mar 10, 2023
49265dd
Merge branch 'dev' into update/agenda-real-remarks
pveland621 Mar 10, 2023
7c5bc6b
adding pmseqnum to eas payload TM-4033
SidelineCory24 Mar 10, 2023
0bafbc6
adding new location fields to EP
pveland621 Mar 10, 2023
82e1dc9
TM-4134, code review
Mar 13, 2023
102044a
addressing feedback
pveland621 Mar 13, 2023
c46256c
Merge branch 'update/agenda-real-remarks' of https://github.com/MetaP…
pveland621 Mar 13, 2023
e17d568
adding check for empty insertion array
pveland621 Mar 13, 2023
7f26f54
Merge pull request #769 from MetaPhase-Consulting/update/pm-filter-so…
elizabeth-jimenez Mar 13, 2023
9631be9
adding check for {blanktextbox} remark
pveland621 Mar 13, 2023
11594f4
Merge branch 'dev' into update/agenda-real-remarks
pveland621 Mar 13, 2023
8c2f786
Merge branch 'dev' into update/pm-date-eas
SidelineCory24 Mar 13, 2023
315a367
removing unnecessary return
pveland621 Mar 13, 2023
a3052e2
Merge branch 'update/agenda-real-remarks' of https://github.com/MetaP…
pveland621 Mar 13, 2023
152e6a0
Merge pull request #760 from MetaPhase-Consulting/update/agenda-real-…
pveland621 Mar 13, 2023
32ea3ed
typo
Mar 13, 2023
7b5b5e2
Merge branch 'dev' into TM-4030_create_update_date_ai
M00staff Mar 13, 2023
2a8f44b
Merge branch 'dev' into update/pm-date-eas
SidelineCory24 Mar 14, 2023
b8ab080
camelCase for consistency
SidelineCory24 Mar 14, 2023
f8888f0
Merge pull request #772 from MetaPhase-Consulting/update/pm-date-eas
SidelineCory24 Mar 14, 2023
b38c643
Merge branch 'dev' into TM-4030_create_update_date_ai
M00staff Mar 14, 2023
c5c5cb3
Merge branch 'dev' into update/eas-combine-location-org
pveland621 Mar 14, 2023
f9d059c
Merge pull request #773 from MetaPhase-Consulting/update/eas-combine-…
pveland621 Mar 14, 2023
e308b58
Merge branch 'dev' into TM-4030_create_update_date_ai
scott062 Mar 14, 2023
57335d8
Merge pull request #771 from MetaPhase-Consulting/TM-4030_create_upda…
scott062 Mar 14, 2023
07100d6
add remarks to aih & pma export TM-4136
SidelineCory24 Mar 16, 2023
721bb1f
simplifying call to get remarks
SidelineCory24 Mar 16, 2023
c0b4930
making use of transformFn
SidelineCory24 Mar 16, 2023
ac4ca82
removing extra spaces
SidelineCory24 Mar 16, 2023
c2423c4
pr feedback
SidelineCory24 Mar 16, 2023
bfb9a19
Map default action and travel values for ef legs for display purposes
scott062 Mar 16, 2023
9b778e4
pr feedback for finally over except
SidelineCory24 Mar 16, 2023
7c5c835
Merge pull request #774 from MetaPhase-Consulting/update/add-remarks-…
SidelineCory24 Mar 17, 2023
d6125a0
Merge branch 'dev' into fix/default-ai-mapping
elizabeth-jimenez Mar 17, 2023
2c4b3b5
Merge pull request #775 from MetaPhase-Consulting/fix/default-ai-mapping
elizabeth-jimenez Mar 17, 2023
72b0cc2
Remove public profile view and endpoint
scott062 Mar 20, 2023
925118e
Merge branch 'staging' into fix/profile-ep
scott062 Mar 20, 2023
0af148c
Remove test
scott062 Mar 20, 2023
b645547
Merge pull request #548 from MetaPhase-Consulting/fix/profile-ep
kakumanipk Mar 20, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
166 changes: 98 additions & 68 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,60 +1,46 @@
version: 2.0
version: 2.1

default-python-node: &default-python-node
image: circleci/python:3.6.1
image: circleci/python:3.6.8
environment:
CC_TEST_REPORTER_ID: 61cf394238222f3d820e702a4679e5bac871cf7fd9395ee614d3d4e4afcd5a4f
CC_TEST_REPORTER_ID: b267008efa014a2c3a1ed266efebeb68bad762a948a54a443b4de581a92c45b0
COMPOSE_FILE_NAME: circleci-docker-compose.yml
default-postgres-node: &default-postgres-node
image: circleci/postgres:9.6.2
environment:
POSTGRES_USER: root
POSTGRES_DB: circle_test
DJANGO_SECRET_KEY: ci_secret_key
default-oracle-node: &default-oracle-node
image: mjoyce91/oracle193db:fast
jobs:
build:
docker:
- *default-python-node
- *default-postgres-node
- *default-oracle-node
steps:
- checkout
- setup_remote_docker
- restore_cache:
key: deps1-{{ .Branch }}-{{ checksum "requirements.txt" }}
key: deps2-{{ .Branch }}-{{ checksum "requirements.txt" }}
- run:
command: |
python3 -m venv venv
. venv/bin/activate
pip install -r requirements.txt
pip install -r requirements-no-deps.txt --no-dependencies
- save_cache:
key: deps1-{{ .Branch }}-{{ checksum "requirements.txt" }}
key: deps2-{{ .Branch }}-{{ checksum "requirements.txt" }}
paths:
- "venv"
docker-build:
docker:
- *default-python-node
steps:
- setup_remote_docker
- checkout
- run:
name: Docker Build
command: |
TAG=$CIRCLE_BRANCH-$CIRCLE_SHA1
IMAGE_NAME="talentmap/${CIRCLE_PROJECT_REPONAME}:${TAG}"
LOWERCASE_IMAGE_NAME=$(echo "$IMAGE_NAME" | awk '{print tolower($0)}')
docker login -u $DOCKER_USER -p $DOCKER_PASS
docker build -t $LOWERCASE_IMAGE_NAME .
docker push $LOWERCASE_IMAGE_NAME
bandit:
docker:
- *default-python-node
steps:
- checkout
- restore_cache:
key: deps1-{{ .Branch }}-{{ checksum "requirements.txt" }}
key: deps2-{{ .Branch }}-{{ checksum "requirements.txt" }}
- run:
command: |
python3 -m venv venv
. venv/bin/activate
pip install -r requirements.txt
pip install -r requirements-no-deps.txt --no-dependencies
- run:
command: |
. venv/bin/activate
Expand All @@ -65,45 +51,113 @@ jobs:
pytest:
docker:
- *default-python-node
- *default-postgres-node
- *default-oracle-node
steps:
- checkout
- setup_remote_docker
- run: curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
- run: chmod +x ./cc-test-reporter
- run: chmod +x ./wait-for-oracle.sh
- run: ./cc-test-reporter before-build
- restore_cache:
key: deps1-{{ .Branch }}-{{ checksum "requirements.txt" }}
key: deps2-{{ .Branch }}-{{ checksum "requirements.txt" }}
- run:
name: pip install
command: |
python3 -m venv venv
. venv/bin/activate
pip install -r requirements.txt
pip install -r requirements-no-deps.txt --no-dependencies
- run:
name: Install SQLPlus
command: |
cd /opt
sudo mkdir oracle
cd ./oracle
sudo apt-get update && sudo apt-get install -y libaio1 wget unzip
sudo wget https://download.oracle.com/otn_software/linux/instantclient/19800/instantclient-basiclite-linux.x64-19.8.0.0.0dbru.zip
sudo wget https://download.oracle.com/otn_software/linux/instantclient/19800/instantclient-sqlplus-linux.x64-19.8.0.0.0dbru.zip
sudo wget https://download.oracle.com/otn_software/linux/instantclient/19800/instantclient-sdk-linux.x64-19.8.0.0.0dbru.zip
sudo unzip instantclient-basiclite-linux.x64-19.8.0.0.0dbru.zip
sudo unzip instantclient-sqlplus-linux.x64-19.8.0.0.0dbru.zip
sudo unzip instantclient-sdk-linux.x64-19.8.0.0.0dbru.zip
sudo rm -f instantclient-basiclite-linux.x64-19.8.0.0.0dbru.zip
sudo rm -f instantclient-sqlplus-linux.x64-19.8.0.0.0dbru.zip
sudo rm -f instantclient-sdk-linux.x64-19.8.0.0.0dbru.zip
cd /opt/oracle/instantclient*
sudo rm -f *jdbc* *occi* *mysql* *README *jar uidrvci genezi adrci
cd /etc/ld.so.conf.d
sudo touch oracle-instantclient.conf
sudo tee oracle-instantclient.conf \<<<"/opt/oracle/instantclient_19_8"
cd /opt/oracle/instantclient*
sudo ldconfig
- run:
name: Create Oracle user
command: |
./wait-for-oracle.sh 127.0.0.1:1521/oraclesid sys oraclepwd 'as sysdba'
./create-oracle-user.sh 127.0.0.1:1521/oraclesid sys oraclepwd 'as sysdba'
- run:
name: Wait for Oracle
command: |
./wait-for-oracle.sh 127.0.0.1:1521/oraclepdb talentmap1 talentmap1 "" true
- run:
name: Python Test Coverage
command: |
. venv/bin/activate
pytest --cov=. --cov-report xml:./coverage.xml
environment:
DATABASE_URL: postgresql://root:@127.0.0.1:5432/circle_test
# DATABASE_URL: postgresql://root:@127.0.0.1:5432/circle_test
DATABASE_URL: 127.0.0.1:1521/oraclepdb
DATABASE_USER: talentmap1
DATABASE_PW: talentmap1
DJANGO_LOG_DIRECTORY: ./
- run: ./cc-test-reporter after-build -t coverage.py --exit-code $?
- store_artifacts:
path: coverage.xml
destination: pytest-cov/coverage.xml
zap:
dependencies:
docker:
- *default-python-node
steps:
- checkout
- restore_cache:
key: deps2-{{ .Branch }}-{{ checksum "requirements.txt" }}
- run:
command: |
python3 -m venv venv
. venv/bin/activate
mkdir ./tmp-pip
pip install -r requirements.txt -t ./tmp-pip
pip install -r requirements-no-deps.txt --no-dependencies -t ./tmp-pip
cd ./tmp-pip
zip -r ../talentmap-api-dependencies.zip * .[^.]*
- store_artifacts:
path: talentmap-api-dependencies.zip
destination: talentmap-api-dependencies.zip
pylint:
docker:
- *default-python-node
steps:
- setup_remote_docker
- checkout
- run: chmod +x wait-for-postgres.sh
- restore_cache:
key: deps2-{{ .Branch }}-{{ checksum "requirements.txt" }}
- run:
name: Replace placeholders in Compose file
command: |
TAG=$CIRCLE_BRANCH-$CIRCLE_SHA1
LOWERCASE_TAG=$(echo "$TAG" | awk '{print tolower($0)}')
LOWERCASE_REPO_NAME=$(echo "$CIRCLE_PROJECT_REPONAME" | awk '{print tolower($0)}')
sed -i "s#@@REPO_NAME@@#${LOWERCASE_REPO_NAME}#g" $COMPOSE_FILE_NAME
sed -i "s#@@LABEL@@#${LOWERCASE_TAG}#g" $COMPOSE_FILE_NAME
python3 -m venv venv
. venv/bin/activate
pip install -r requirements.txt
pip install -r requirements-no-deps.txt --no-dependencies
- run:
name: pylint
command: |
. venv/bin/activate
pylint ./talentmap_api/ --rcfile=./.pylintrc --output-format=text || pylint-exit --error-fail $?
zap:
docker:
- *default-python-node
steps:
- checkout
- run: chmod +x wait-for-oracle.sh
- run:
name: Initialize Dummy Data Container
command: |
Expand All @@ -114,7 +168,7 @@ jobs:
command: |
docker-compose -f $COMPOSE_FILE_NAME \
run app bash -c \
"./wait-for-postgres.sh db && python manage.py migrate"
"./wait-for-oracle.sh oracle && python manage.py migrate"
- run:
name: Start Server
command: docker-compose -f $COMPOSE_FILE_NAME up -d
Expand All @@ -134,47 +188,23 @@ jobs:
- store_artifacts:
path: zap_results.md
destination: zap/zap_results.md
push-stable:
docker:
- *default-python-node
steps:
- setup_remote_docker
- run:
name:
command: |
TAG=$CIRCLE_BRANCH-$CIRCLE_SHA1
LOWERCASE_TAG=$(echo "$TAG" | awk '{print tolower($0)}')
LOWERCASE_REPO_NAME=$(echo "$CIRCLE_PROJECT_REPONAME" | awk '{print tolower($0)}')
LOWERCASE_BRANCH_NAME=$(echo "$CIRCLE_BRANCH" | awk '{print tolower($0)}')
docker login -u $DOCKER_USER -p $DOCKER_PASS
docker pull talentmap/$LOWERCASE_REPO_NAME:$LOWERCASE_TAG
docker tag talentmap/$LOWERCASE_REPO_NAME:$LOWERCASE_TAG talentmap/$LOWERCASE_REPO_NAME:$LOWERCASE_BRANCH_NAME
docker push talentmap/$LOWERCASE_REPO_NAME:$LOWERCASE_BRANCH_NAME
workflows:
version: 2
build_and_test:
jobs:
- build
- docker-build:
requires:
- build
- pylint
- bandit:
requires:
- build
- pytest:
requires:
- build
- zap:
- dependencies:
requires:
- docker-build
- build
- zap:
filters:
tags:
only: /^zap.*/
branches:
ignore: /.*/
- push-stable:
requires:
- docker-build
- pytest
- bandit
- zap
1 change: 1 addition & 0 deletions .codeclimate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,4 @@ exclude_paths:
- "**/migrations/"
- "**/saml2/*"
- "**/commands/*" # Management commands may have odd structures (due to lots of conditionals checking options)
- "**/cache/*" # Cache bit constructors require many parameters
2 changes: 1 addition & 1 deletion .coveragerc
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[run]
omit = *apps.py, *wsgi.py, manage.py, **/settings.py, */venv/*, **/soap_api_test.py
omit = *apps.py, *wsgi.py, manage.py, show_logo.py, **/settings.py, */venv/*, */tests/mommy_recipes.py, **/soap_api_test.py, */saml2/*, **/locustfile.py, */common/renderers.py
3 changes: 3 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Dual Merge:
- [FE PR](linkToFrontEndPR)
- [Mock PR](linkToMockPR)
7 changes: 7 additions & 0 deletions .github/weekly-digest.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Configuration for weekly-digest - https://github.com/apps/weekly-digest
publishDay: sun
canPublishIssues: true
canPublishPullRequests: true
canPublishContributors: true
canPublishStargazers: true
canPublishCommits: true
70 changes: 70 additions & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
#
# ******** NOTE ********
# We have attempted to detect the languages in your repository. Please check
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: "CodeQL"

on:
push:
branches: [ dev ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ dev ]
schedule:
- cron: '38 14 * * 2'

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write

strategy:
fail-fast: false
matrix:
language: [ 'python' ]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
# Learn more about CodeQL language support at https://git.io/codeql-language-support

steps:
- name: Checkout repository
uses: actions/checkout@v2

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl

# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language

#- run: |
# make bootstrap
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
16 changes: 16 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ __pycache__/
.Python
env/
build/
coverage.html/
develop-eggs/
dist/
downloads/
Expand Down Expand Up @@ -45,6 +46,8 @@ nosetests.xml
coverage.xml
*.cover
.hypothesis/
.pytest/
.pytest_cache/

# Translations
*.mo
Expand Down Expand Up @@ -94,6 +97,9 @@ ENV/
# Rope project settings
.ropeproject

# VSCode
.vscode

# mkdocs documentation
/site

Expand All @@ -105,7 +111,17 @@ missing_coverage.sh
# MacOS
.DS_Store

# PyCharm
.idea/

#Environment setup script
setup_environment.sh

talentmap_api/saml2/remote_metadata/remote_metadata.xml

#Test_Data
talentmap_api/data/test_data/real/
obc_consolidated.csv
cwallet.sso
sqlnet.ora
tnsnames.ora
Loading