Skip to content

Commit

Permalink
Last fixes after rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
sebastian-aranda committed Sep 8, 2023
1 parent 2bd3241 commit 1372abf
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
12 changes: 6 additions & 6 deletions manager/api/tests/test_lfa.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from django.http import HttpRequest
from django.test import TestCase, override_settings
from django.utils.datastructures import MultiValueDict
from api.views import lfa
from manager.utils import upload_to_lfa


@override_settings(DEBUG=True)
Expand All @@ -17,7 +17,7 @@ def setUp(self):
def test_no_files_uploaded(self, mock_post):
request = HttpRequest()
request.FILES = MultiValueDict()
response = lfa(request, option="upload-file")
response = upload_to_lfa(request, option="upload-file")
self.assertEqual(response.status_code, 400)
self.assertEqual(response.data, {"ack": "No files to upload"})

Expand All @@ -30,7 +30,7 @@ def test_successful_file_upload(self, mock_post):

request = HttpRequest()
request.FILES["file[]"] = [SimpleUploadedFile("test.txt", b"file_content")]
response = lfa(request, option="upload-file")
response = upload_to_lfa(request, option="upload-file")
self.assertEqual(response.status_code, 200)
self.assertEqual(
response.data,
Expand Down Expand Up @@ -61,7 +61,7 @@ def test_successful_multiple_file_upload(self, mock_post):
uploaded_file2 = SimpleUploadedFile("test2.txt", b"file_content_2")
request.FILES = MultiValueDict({"file[]": [uploaded_file1, uploaded_file2]})

response = lfa(request, option="upload-file")
response = upload_to_lfa(request, option="upload-file")

self.assertEqual(response.status_code, 200)
self.assertEqual(
Expand All @@ -83,13 +83,13 @@ def test_failed_file_upload(self, mock_post):

request = HttpRequest()
request.FILES["file[]"] = [SimpleUploadedFile("test.txt", b"file_content")]
response = lfa(request, option="upload-file")
response = upload_to_lfa(request, option="upload-file")
self.assertEqual(response.status_code, 400)
self.assertEqual(response.data, {"ack": "Error when uploading files"})

def test_invalid_option(self):
request = HttpRequest()
request.FILES["file[]"] = [SimpleUploadedFile("test.txt", b"file_content")]
response = lfa(request, option="invalid-option")
response = upload_to_lfa(request, option="invalid-option")
self.assertEqual(response.status_code, 400)
self.assertEqual(response.data, {"ack": "Option not found"})
10 changes: 5 additions & 5 deletions manager/manager/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@ def url(self, name):
return name
return f"{settings.MEDIA_URL}{name}"


def upload_to_lfa(request, *args, **kwargs):
"""Connects to LFA API to upload a new file
Expand Down Expand Up @@ -197,6 +198,7 @@ def upload_to_lfa(request, *args, **kwargs):

return Response({"ack": "Option not found"}, status=400)


def get_jira_title(request_data):
"""Generate title for a jira ticket
Expand Down Expand Up @@ -356,11 +358,7 @@ def jira_ticket(request_data):
if "request_type" not in request_data:
return Response({"ack": "Error reading request type"}, status=400)

tags_data = (
request_data.get("tags").split(",")
if request_data.get("tags") != 'undefined'
else []
)
tags_data = request_data.get("tags").split(",") if request_data.get("tags") else []

try:
jira_payload = {
Expand Down Expand Up @@ -409,6 +407,7 @@ def jira_ticket(request_data):
status=400,
)


def jira_comment(request_data):
"""Connects to JIRA API to add a comment to a previously created ticket on a specific project.
For more information on issuetypes refer to:
Expand Down Expand Up @@ -462,6 +461,7 @@ def jira_comment(request_data):
status=400,
)


def get_client_ip(request):
"""Return the client IP address.
Expand Down

0 comments on commit 1372abf

Please sign in to comment.