Skip to content

Commit

Permalink
Change uploadedfiles API to userfiles API (#528)
Browse files Browse the repository at this point in the history
* Change uploadedfiles API to userfiles API

* Change uploadedfiles API to userfiles API
  • Loading branch information
jbernal0019 authored Oct 19, 2023
1 parent 9ac0908 commit 01b2928
Show file tree
Hide file tree
Showing 35 changed files with 489 additions and 554 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ After running the Integration tests the ``./CHRIS_REMOTE_FS`` directory **must**
Make sure the ``chris_backend/`` dir is world writable. Then type:

```bash
docker compose -f docker-compose_dev.yml exec chris_dev coverage run --source=feeds,plugins,uploadedfiles,users manage.py test
docker compose -f docker-compose_dev.yml exec chris_dev coverage run --source=feeds,plugins,userfiles,users manage.py test
docker compose -f docker-compose_dev.yml exec chris_dev coverage report
```

Expand Down
2 changes: 1 addition & 1 deletion chris_backend/config/settings/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
'plugininstances',
'pipelines',
'pipelineinstances',
'uploadedfiles',
'userfiles',
'pacsfiles',
'servicefiles',
'filebrowser',
Expand Down
2 changes: 1 addition & 1 deletion chris_backend/config/settings/local.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
}

for app in ['collectionjson', 'core', 'feeds', 'plugins', 'plugininstances', 'pipelines',
'pipelineinstances', 'uploadedfiles', 'pacsfiles', 'servicefiles', 'users',
'pipelineinstances', 'userfiles', 'pacsfiles', 'servicefiles', 'users',
'filebrowser', 'workflows']:
LOGGING['loggers'][app] = {
'level': 'DEBUG',
Expand Down
26 changes: 13 additions & 13 deletions chris_backend/core/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from pipelines import views as pipeline_views
from pipelineinstances import views as pipelineinstance_views
from workflows import views as workflow_views
from uploadedfiles import views as uploadedfile_views
from userfiles import views as userfile_views
from pacsfiles import views as pacsfile_views
from servicefiles import views as servicefile_views
from filebrowser import views as filebrowser_views
Expand Down Expand Up @@ -326,21 +326,21 @@
name='workflow-plugininstance-list'),


path('v1/uploadedfiles/',
uploadedfile_views.UploadedFileList.as_view(),
name='uploadedfile-list'),
path('v1/userfiles/',
userfile_views.UserFileList.as_view(),
name='userfile-list'),

path('v1/uploadedfiles/search/',
uploadedfile_views.UploadedFileListQuerySearch.as_view(),
name='uploadedfile-list-query-search'),
path('v1/userfiles/search/',
userfile_views.UserFileListQuerySearch.as_view(),
name='userfile-list-query-search'),

path('v1/uploadedfiles/<int:pk>/',
uploadedfile_views.UploadedFileDetail.as_view(),
name='uploadedfile-detail'),
path('v1/userfiles/<int:pk>/',
userfile_views.UserFileDetail.as_view(),
name='userfile-detail'),

re_path(r'^v1/uploadedfiles/(?P<pk>[0-9]+)/.*$',
uploadedfile_views.UploadedFileResource.as_view(),
name='uploadedfile-resource'),
re_path(r'^v1/userfiles/(?P<pk>[0-9]+)/.*$',
userfile_views.UserFileResource.as_view(),
name='userfile-resource'),


path('v1/pacsfiles/',
Expand Down
2 changes: 1 addition & 1 deletion chris_backend/feeds/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ def list(self, request, *args, **kwargs):
'tags': reverse('tag-list', request=request),
'pipelinesourcefiles': reverse('pipelinesourcefile-list',
request=request),
'uploadedfiles': reverse('uploadedfile-list', request=request),
'userfiles': reverse('userfile-list', request=request),
'pacsfiles': reverse('pacsfile-list', request=request),
'servicefiles': reverse('servicefile-list', request=request),
'filebrowser': reverse('filebrowserpath-list', request=request)}
Expand Down
Loading

0 comments on commit 01b2928

Please sign in to comment.