Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Sign in
Toggle navigation
R
red-ci-cd
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
red-group-test
red-ci-cd
Commits
77b5f8ec
Commit
77b5f8ec
authored
Nov 25, 2019
by
John Red Medrano
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added new endpoint for ETL users
parent
c219285e
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
265 additions
and
166 deletions
+265
-166
app/applicationlayer/download/batch_upload/serializer.py
app/applicationlayer/download/batch_upload/serializer.py
+0
-11
app/applicationlayer/download/batch_upload/views.py
app/applicationlayer/download/batch_upload/views.py
+0
-24
app/applicationlayer/management/batchupload/serializer.py
app/applicationlayer/management/batchupload/serializer.py
+24
-1
app/applicationlayer/management/batchupload/views.py
app/applicationlayer/management/batchupload/views.py
+232
-128
app/applicationlayer/urls.py
app/applicationlayer/urls.py
+0
-2
app/entities/models.py
app/entities/models.py
+9
-0
No files found.
app/applicationlayer/download/batch_upload/serializer.py
deleted
100644 → 0
View file @
c219285e
from
rest_framework
import
serializers
from
app.entities.models
import
MasterAttachment
class
BatchUploadSerializer
(
serializers
.
ModelSerializer
):
class
Meta
:
model
=
MasterAttachment
fields
=
'__all__'
read_only_fields
=
(
'created'
,
'createdby'
,
'modified'
,
'modifiedby'
,
'code'
,
)
app/applicationlayer/download/batch_upload/views.py
deleted
100644 → 0
View file @
c219285e
from
rest_framework
import
viewsets
,
status
from
rest_framework.response
import
Response
from
app.entities.models
import
MasterAttachment
from
app.applicationlayer.utils
import
(
CustomPagination
,
status_message_response
,
log_save
)
# from django_filters.rest_framework import DjangoFilterBackend
from
app.applicationlayer.download.batch_upload.serializer
import
(
BatchUploadSerializer
)
import
os
import
configparser
config
=
configparser
.
ConfigParser
()
config_file
=
os
.
path
.
join
(
'./'
,
'env.ini'
)
config
.
read
(
config_file
)
class
BatchUploadFormatViewSet
(
viewsets
.
ModelViewSet
):
queryset
=
MasterAttachment
.
objects
.
filter
(
url__contains
=
config
[
'SETTINGS'
][
'BATCH_UPLOAD_FORMAT_FILENAME'
]
)
serializer_class
=
BatchUploadSerializer
app/applicationlayer/management/batchupload/serializer.py
View file @
77b5f8ec
from
rest_framework
import
serializers
from
app.entities.models
import
ExtractTransformLoad
,
UserHistory
from
app.entities.models
import
(
ExtractTransformLoad
,
UserHistory
,
MasterAttachment
)
class
ExtractTransformLoadSerializer
(
serializers
.
ModelSerializer
):
...
...
@@ -18,3 +20,24 @@ class UserHistorySerializer(serializers.ModelSerializer):
read_only_fields
=
(
'created'
,
'createdby'
,
'modified'
,
'code'
)
class
BatchUploadSerializer
(
serializers
.
ModelSerializer
):
class
Meta
:
model
=
MasterAttachment
fields
=
'__all__'
read_only_fields
=
(
'created'
,
'createdby'
,
'modified'
,
'modifiedby'
,
'code'
,
)
class
BatchUploadSerializer
(
serializers
.
ModelSerializer
):
class
Meta
:
model
=
MasterAttachment
fields
=
'__all__'
read_only_fields
=
(
'created'
,
'createdby'
,
'modified'
,
'modifiedby'
,
'code'
,
)
app/applicationlayer/management/batchupload/views.py
View file @
77b5f8ec
This diff is collapsed.
Click to expand it.
app/applicationlayer/urls.py
View file @
77b5f8ec
...
...
@@ -15,7 +15,6 @@ from app.applicationlayer.management.delegation.views import DelegationViewSet
from
app.applicationlayer.download.accounts.views
import
UserDownloadRequest
from
app.applicationlayer.download.department.views
import
DepartmentDownloadRequest
from
app.applicationlayer.download.company.views
import
CompanyDownloadRequest
from
app.applicationlayer.download.batch_upload.views
import
BatchUploadFormatViewSet
router
=
routers
.
DefaultRouter
()
...
...
@@ -29,7 +28,6 @@ router.register(r'notifications', NotificationsViewset)
router
.
register
(
r'user-download'
,
UserDownloadRequest
)
router
.
register
(
r'department-download'
,
DepartmentDownloadRequest
)
router
.
register
(
r'company-download'
,
CompanyDownloadRequest
)
router
.
register
(
r'batch-upload-format'
,
BatchUploadFormatViewSet
)
router
.
register
(
r'delegations'
,
DelegationViewSet
)
router
.
register
(
r'extract-transform-load'
,
BatchUploadViewSet
)
...
...
app/entities/models.py
View file @
77b5f8ec
...
...
@@ -8,6 +8,7 @@ from datetime import datetime
from
.
import
enums
from
django.utils.text
import
slugify
from
datetime
import
timedelta
import
os
# ********************* AUTH TABLES *********************
...
...
@@ -522,6 +523,14 @@ class MasterAttachment(models.Model):
blank
=
True
,
null
=
True
)
attch_ref
=
models
.
TextField
()
def
delete
(
self
,
*
args
,
**
kwargs
):
print
(
self
.
url
.
name
)
if
os
.
path
.
isfile
(
self
.
url
.
path
):
os
.
remove
(
self
.
url
.
path
)
super
(
MasterAttachment
,
self
)
.
delete
(
*
args
,
**
kwargs
)
class
Meta
:
db_table
=
'master_attachments'
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment