Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Restructure #9

Merged
merged 74 commits into from
Apr 29, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
8687cb2
added url field to departmentApi
ayanchoudhary Aug 8, 2019
fa492dd
added url field to department and made courseApi
ayanchoudhary Aug 30, 2019
50daa44
completed models, serializers, views and made api endpoints for get r…
ayanchoudhary Aug 31, 2019
f5e99ab
added delete api and cors whitelist
ayanchoudhary Aug 31, 2019
3b1eaa6
changes in delete request for courses
ayanchoudhary Sep 1, 2019
49520cb
made port changes
ayanchoudhary Sep 23, 2019
611deda
added query for department with abbr and course with code
ayanchoudhary Sep 25, 2019
77e27e9
made fileUpload changes to file model and made dynamic renderring fun…
ayanchoudhary Oct 7, 2019
3219bf1
added file field to serializer
ayanchoudhary Oct 9, 2019
beddc95
fixed delete request
ayanchoudhary Oct 14, 2019
8b1dd1d
changes in api
ayanchoudhary Oct 24, 2019
bad4b61
fix:merge cherry-pick commit
ayanchoudhary Oct 31, 2019
1f25778
changes in file model
ayanchoudhary Oct 31, 2019
326a7a1
fix driveid field
ayanchoudhary Oct 31, 2019
a81c1d5
removed unnecessary prints
ayanchoudhary Oct 31, 2019
bea9de7
fixed post request for files
ayanchoudhary Oct 31, 2019
26b73a1
feat:added course fetch and get department detail through one request
ayanchoudhary Nov 1, 2019
3c9c222
refactor: department post requests
ayanchoudhary Nov 24, 2019
bebd864
feat:made user and upload models
ayanchoudhary Dec 16, 2019
858e7d8
lint fixes
ayanchoudhary Dec 26, 2019
dc26f7b
made uploads model
ayanchoudhary Dec 26, 2019
a39418e
feat:configured request get and creation post requests
ayanchoudhary Dec 28, 2019
2873d93
feat:configured update route on request
ayanchoudhary Dec 28, 2019
14d38be
feat:integrateg falcon client and completed user get and post functions
ayanchoudhary Jan 27, 2020
397de52
fix: alter profile_image field to hold image url
ayanchoudhary Jan 27, 2020
30cc0c9
feat:retrieved file from frontend in backend
ayanchoudhary Jan 27, 2020
0d7cc47
feat:integrated file upload route with drive api
ayanchoudhary Jan 27, 2020
fae096c
feat:added filetype field to upload
ayanchoudhary Jan 29, 2020
5c05f0e
feat:implemented JWT and added courses array field to user model
ayanchoudhary Feb 13, 2020
9d1ca9c
feat:made add course route
ayanchoudhary Feb 17, 2020
37ab2a8
added date field to requests
ayanchoudhary Feb 17, 2020
6cfb86e
refactor:abstaction of JWT decoding sequence and fix:filter bugs in u…
ayanchoudhary Feb 18, 2020
65e925e
added date field to uploads and serialized upload title and filetype
ayanchoudhary Feb 18, 2020
632cb7d
feat:made course request model
ayanchoudhary Feb 18, 2020
64376f3
fix:upload route file management conditions and make user course dele…
ayanchoudhary Feb 19, 2020
2a31569
added status field to uploads model
ayanchoudhary Feb 19, 2020
c7f3e28
fix:standardize department get request response
ayanchoudhary Mar 15, 2020
d7c1b5d
fix: linting according to PEP8 standards
ayanchoudhary Mar 23, 2020
0ccf3a0
chore: add .pylintrc and added packages to requirements.txt
ayanchoudhary Mar 29, 2020
ddfdeb3
chore: added new dependencies in requirements.txt
ayanchoudhary Mar 29, 2020
8e5edef
refactor: separate user related functions into a separate app
ayanchoudhary Apr 7, 2020
cbc58f0
Implemented search using elasticsearch
mhk19 Apr 10, 2020
8f9eae8
implemented search
mhk19 Apr 10, 2020
2f5cca1
removed unnecessary print statements
mhk19 Apr 10, 2020
d14eba1
Revert "implemented search"
mhk19 Apr 10, 2020
fa3ade9
Revert "Implemented search using elasticsearch"
mhk19 Apr 10, 2020
39625d4
Fixed styling issues and added HTTP status response
mhk19 Apr 10, 2020
fb98f1f
Fixed styling issues and added HTTP status response
mhk19 Apr 10, 2020
a400ed8
added import statements
mhk19 Apr 10, 2020
b0678c1
fixed conflicts
mhk19 Apr 10, 2020
f365e39
added setup instructions
mhk19 Apr 10, 2020
19af5e1
added command to initialize indexes
mhk19 Apr 11, 2020
06826ee
Merge pull request #11 from sdslabs/mahak
ayanchoudhary Apr 11, 2020
e1dde87
refactor: separate user related functions into a separate app
ayanchoudhary Apr 7, 2020
ca89b76
feat: rebase search and remove unnecessary url registers
ayanchoudhary Apr 12, 2020
81762de
feat: configure elastic search and django server to docker
ayanchoudhary Apr 12, 2020
1c94598
merge rebase
ayanchoudhary Apr 12, 2020
7cc2754
chore: added test data and ingestion script
ayanchoudhary Apr 12, 2020
e190a4b
chore: remove config/postgres.yml from .gitignore
ayanchoudhary Apr 12, 2020
e2798fa
docs: update setup instructions in README
ayanchoudhary Apr 13, 2020
80d9567
chore: add index rebuilding script to ingest.sh
ayanchoudhary Apr 13, 2020
dc60437
chore: remove litter from Dockerfile
ayanchoudhary Apr 14, 2020
466beb6
chore: simplify data addition through ingest script
ayanchoudhary Apr 14, 2020
7c2beb3
feat: integrated file initial upload to review folders functionality
ayanchoudhary Apr 18, 2020
7b6a725
fix: remove non finalized files from search index
ayanchoudhary Apr 21, 2020
ad31a30
fix: added makemigrations command to docker-compose
ayanchoudhary Apr 22, 2020
7f7b81b
restructure: move falcon clients and drive file to appropriate folder…
ayanchoudhary Apr 22, 2020
57a7429
docs: added alternate setup instructions
ayanchoudhary Apr 22, 2020
51fa0d3
feat add workflow to run lint test
ayanchoudhary Apr 22, 2020
bc3e01b
fix: lint issues
ayanchoudhary Apr 22, 2020
e6c269f
Merge pull request #13 from sdslabs/lint_test
ayanchoudhary Apr 22, 2020
26c7b5b
feat: added api_test
ayanchoudhary Apr 22, 2020
813530d
Merge pull request #14 from sdslabs/api_test
ayanchoudhary Apr 22, 2020
770a055
chore: add rextra_hosts to docker-compose
ayanchoudhary Apr 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
13 changes: 13 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# editorconfig.org
root = true

[*]
indent_style = space
indent_size = 2
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[*.md]
trim_trailing_whitespace = false
37 changes: 37 additions & 0 deletions .github/workflows/api_test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: Python CI

on:
push:

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Set up Python 3.7
uses: actions/setup-python@v1
with:
python-version: 3.7
- name: Install PostgreSQL 10 client
run: |
sudo apt-get -yqq install libpq-dev
- name: Install libexempi3
run: |
sudo apt-get install -y libexempi3
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt
pip install pytest && pip install requests
- name: Start docker
run: |
docker container prune -f
docker-compose up -d
bash -c 'while [[ "$(curl --insecure -s -o /dev/null -w ''%{http_code}'' http://localhost:8005/api/v1/departments)" != "200" ]]; do sleep 10 && docker logs studyportal-nexus; done'
./ingest.sh
bash -c 'while [[ "$(curl --insecure -s -o /dev/null -w ''%{http_code}'' http://localhost:8005/api/v1/search/?q=test)" != "200" ]]; do sleep 5; done'
- name: Run Tests
run: |
pytest
22 changes: 22 additions & 0 deletions .github/workflows/lint_test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Lint Test
on:
push:

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up Python 3.7
uses: actions/setup-python@v1
with:
python-version: 3.7
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install pycodestyle
- name: Run lint test
run: |
pycodestyle
env:
ADMIN_GITHUB_TOKEN: ${{ secrets.ADMIN_GITHUB_TOKEN }}
126 changes: 122 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,122 @@
.idea
.vscode
studyportal/config/postgresql.yml
**/__pycache__
# Django #
*.log
*.pot
*.pyc
__pycache__
db.sqlite3
media

# Backup files #
*.bak

# If you are using PyCharm #
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/dictionaries
.idea/**/dataSources/
.idea/**/dataSources.ids
.idea/**/dataSources.xml
.idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml
.idea/**/gradle.xml
.idea/**/libraries
*.iws /out/

# Python #
*.py[cod]
*$py.class

# Distribution / packaging
.Python build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
*.egg-info/
.installed.cfg
*.egg
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.coverage
.coverage.*
.cache
.pytest_cache/
nosetests.xml
coverage.xml
*.cover
.hypothesis/

# Jupyter Notebook
.ipynb_checkpoints

# pyenv
.python-version

# celery
celerybeat-schedule.*

# SageMath parsed files
*.sage.py

# Environments
.env
.venv
env/
venv/
ENV/
env.bak/
venv.bak/

# mkdocs documentation
/site

# mypy
.mypy_cache/

# Sublime Text #
*.tmlanguage.cache
*.tmPreferences.cache
*.stTheme.cache
*.sublime-workspace
*.sublime-project

# sftp configuration file
sftp-config.json

# Package control specific files Package
Control.last-run
Control.ca-list
Control.ca-bundle
Control.system-ca-bundle
GitHub.sublime-settings

# Visual Studio Code #
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
.history

# Files
/files/*
credentials.json
venv/
studyportal/drive/structure.json
Loading