feat: support more FOSSology properties

Author: tngraf

ChangeLog.md

@@ -1,5 +1,18 @@
 # ChangeLog - FOSSology.REST.dotnet
 
+## 1.5.0 (2025-08-07)
+
+* Support of more scan/decider options:
+    * `ConcludeLicenseType`
+    * `CopyrightDeactivation`
+    * `CopyrightClutterRemoval`
+    * `Patent`
+    * `Heritage`
+    * `Compatibility`
+* More Upload properties
+    * `AssigneeDate`
+    * `ClosingDate`
+
 ## 1.4.1 (2024-10-19)
 
 * Dependency updates, especially RestSharp 108.0.3 to 112.1.0 to fix a security vulnerability.

Fossology.Rest.Dotnet.Model/Analysis.cs

@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------------
 // <copyright file="Analysis.cs" company="Tethys">
-//   Copyright (C) 2020-2022 T. Graf
+//   Copyright (C) 2020-2025 T. Graf
 // </copyright>
 //
 // Licensed under the MIT License.
@@ -80,5 +80,23 @@ public class Analysis
         /// </summary>
         [JsonProperty("reso")]
         public bool Reso { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether to use the patent analysis.
+        /// </summary>
+        [JsonProperty("patent")]
+        public bool Patent { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether to use the Software Heritage analysis.
+        /// </summary>
+        [JsonProperty("heritage")]
+        public bool Heritage { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether to use the compatibility analysis.
+        /// </summary>
+        [JsonProperty("compatibility")]
+        public bool Compatibility { get; set; }
     } // Analysis
 }

Fossology.Rest.Dotnet.Model/DeciderInfo.cs

@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------------
 // <copyright file="DeciderInfo.cs" company="Tethys">
-//   Copyright (C) 2019-2020 T. Graf
+//   Copyright (C) 2019-2025 T. Graf
 // </copyright>
 //
 // Licensed under the MIT License.
@@ -44,5 +44,25 @@ public class DeciderInfo
         /// </summary>
         [JsonProperty("ojo_decider")]
         public bool OjoDecider { get; set; }
+
+        /// <summary>
+        /// Gets or sets the type of the auto conclude license.
+        /// Auto conclude license if they are of provided type. Omit the field or keep as
+        /// empty string to not use this option.
+        /// </summary>
+        [JsonProperty("conclude_license_type")]
+        public string ConcludeLicenseType { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether to do copyright deactivation.
+        /// </summary>
+        [JsonProperty("copyright_deactivation")]
+        public bool CopyrightDeactivation { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether to use copyright clutter removal.
+        /// </summary>
+        [JsonProperty("copyright_clutter_removal")]
+        public bool CopyrightClutterRemoval { get; set; }
     } // DeciderInfo
 }

Fossology.Rest.Dotnet.Model/Upload.cs

@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------------
 // <copyright file="Upload.cs" company="Tethys">
-//   Copyright (C) 2019-2022 T. Graf
+//   Copyright (C) 2019-2025 T. Graf
 // </copyright>
 //
 // Licensed under the MIT License.
@@ -76,6 +76,18 @@ public class Upload
         [JsonProperty("assignee", DefaultValueHandling = DefaultValueHandling.Ignore)]
         public string Assignee { get; set; }
 
+        /// <summary>
+        /// Gets or sets the date, when a user was assigned to the upload.
+        /// </summary>
+        [JsonProperty("assigneeDate", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public string AssigneeDate { get; set; }
+
+        /// <summary>
+        /// Gets or sets the date, when the upload was closed or rejected.
+        /// </summary>
+        [JsonProperty("closingDate", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public string ClosingDate { get; set; }
+
         /// <summary>
         /// Gets or sets the hash of the file.
         /// </summary>

Fossology.Rest.Dotnet.Test/FossologyClientTest.cs

@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------------
 // <copyright file="FossologyClientTest.cs" company="Tethys">
-//   Copyright (C) 2019-2023 T. Graf
+//   Copyright (C) 2019-2025 T. Graf
 // </copyright>
 //
 // Licensed under the MIT License.
@@ -45,7 +45,7 @@ public class FossologyClientTest
         /// <summary>
         /// The access token.
         /// </summary>
-        private const string Token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE3Mjk2NDE1OTksIm5iZiI6MTcyOTI5NjAwMCwianRpIjoiTWk0eiIsInNjb3BlIjoid3JpdGUifQ.XDoC_pByw2RaxJFO_F-PM7zrJlCIyu1G3UyD3_7QeQ4";
+        private const string Token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE3NTQ4NzAzOTksIm5iZiI6MTc1NDUyNDgwMCwianRpIjoiTWk0eiIsInNjb3BlIjoid3JpdGUifQ.HlCrnsrdD8fzjpzcoD5I6ozZRtb5obgja5vIf-pI0gk";
 
         /// <summary>
         /// The filename of a test package.
@@ -576,6 +576,8 @@ public void TestTriggerJob()
             job.Decider.BulkReused = true;
             job.Decider.NewScanner = true;
             job.Decider.OjoDecider = true;
+            job.Decider.CopyrightDeactivation = true;
+            job.Decider.CopyrightClutterRemoval = true;
             job.Reuse.ReuseUploadId = 0;
             job.Reuse.ReuseGroup = 0;
             job.Reuse.ReuseMain = true;
@@ -723,7 +725,7 @@ public void TestDownloadReport()
             var reportId = TriggerReportGeneration(uploadId);
 
             // ugly but required: wait some time until report is available
-            Thread.Sleep(3000);
+            Thread.Sleep(5000);
 
             var client = new FossologyClient(LocalUrl, Token);
             client.DownloadReport(reportId, ReportName);
@@ -1188,6 +1190,21 @@ public void TestDeleteUserSuccess()
             Assert.AreEqual(202, result.Code);
         }
 #endif
+
+        /// <summary>
+        /// Unit test.
+        /// </summary>
+        [TestMethod]
+        public void TestGetScanCodeResults()
+        {
+            const int UploadId = 8;
+
+            var client = new FossologyClient(LocalUrl, Token);
+            var itemId = client.GetTopItem(UploadId);
+
+            var result = client.GetUploadScanCodeCopyrights(UploadId, itemId, "active", 100, 1);
+            Assert.IsNotNull(result);
+        }
         #endregion TESTS THAT REQUIRE MANUAL PREPARATION
 
         //// ---------------------------------------------------------------------