diff --git a/fossology/obj.py b/fossology/obj.py index 535495a..89740f2 100644 --- a/fossology/obj.py +++ b/fossology/obj.py @@ -426,9 +426,9 @@ def __init__( self.description = description self.uploadname = uploadname self.uploaddate = uploaddate - self.assignee = (assignee,) - self.assigneeDate = (assigneeDate,) - self.closeDate = (closingDate,) + self.assignee = assignee + self.assigneeDate = assigneeDate + self.closeDate = closingDate self.hash = Hash.from_json(hash) self.additional_info = kwargs diff --git a/tests/test_uploads.py b/tests/test_uploads.py index 4a12369..2c741c6 100644 --- a/tests/test_uploads.py +++ b/tests/test_uploads.py @@ -17,6 +17,40 @@ from fossology.obj import Folder, Upload +def test_upload_assignee_fields_are_not_wrapped_in_tuples(): + upload = Upload( + folderid=1, + foldername="root", + id=42, + description="", + uploadname="example.tar.gz", + uploaddate="2024-01-01", + assignee="alice", + assigneeDate="2024-01-02", + closingDate="2024-01-03", + hash={"sha1": "", "md5": "", "sha256": "", "size": 0}, + ) + assert upload.assignee == "alice" + assert upload.assigneeDate == "2024-01-02" + assert upload.closeDate == "2024-01-03" + + unassigned = Upload( + folderid=1, + foldername="root", + id=43, + description="", + uploadname="example.tar.gz", + uploaddate="2024-01-01", + hash={"sha1": "", "md5": "", "sha256": "", "size": 0}, + ) + assert unassigned.assignee is None + assert not unassigned.assignee + assert unassigned.assigneeDate is None + assert not unassigned.assigneeDate + assert unassigned.closeDate is None + assert not unassigned.closeDate + + def test_upload_sha1(upload: Upload): assert upload.uploadname == "base-files_11.tar.xz" assert upload.hash.sha1 == "D4D663FC2877084362FB2297337BE05684869B00"