From 6e9174aaf720e70fcc8ff0ff3d48b38b9dd09a05 Mon Sep 17 00:00:00 2001
From: Andrii Bodnar <andrii.bodnar@crowdin.com>
Date: Wed, 26 Jul 2023 09:21:51 +0300
Subject: [PATCH] fix: 'unassignLabelFromStrings' - 'stringIds' parameter

---
 .../com/crowdin/client/labels/LabelsApi.java  |   6 +-
 src/test/java/com/crowdin/client/.DS_Store    | Bin 0 -> 6148 bytes
 .../crowdin/client/labels/LabelsApiTest.java  |  54 ++++++++----------
 3 files changed, 29 insertions(+), 31 deletions(-)
 create mode 100644 src/test/java/com/crowdin/client/.DS_Store

diff --git a/src/main/java/com/crowdin/client/labels/LabelsApi.java b/src/main/java/com/crowdin/client/labels/LabelsApi.java
index 6c752d4f8..e91fc37c1 100644
--- a/src/main/java/com/crowdin/client/labels/LabelsApi.java
+++ b/src/main/java/com/crowdin/client/labels/LabelsApi.java
@@ -133,15 +133,17 @@ public ResponseList<SourceString> assignLabelToStrings(Long projectId, Long labe
     /**
      * @param projectId Project Identifier
      * @param labelId Label Identifier
+     * @param stringIds List of string IDs
      * @return Source string
      * @see <ul>
      * <li><a href="https://developer.crowdin.com/api/v2/#operation/api.projects.labels.strings.deleteMany" target="_blank"><b>API Documentation</b></a></li>
      * <li><a href="https://developer.crowdin.com/enterprise/api/v2/#operation/api.projects.labels.strings.deleteMany" target="_blank"><b>Enterprise API Documentation</b></a></li>
      * </ul>
      */
-    public ResponseList<SourceString> unassignLabelFromStrings(Long projectId, Long labelId) throws HttpException, HttpBadRequestException {
+    public ResponseList<SourceString> unassignLabelFromStrings(Long projectId, Long labelId, List<Long> stringIds) throws HttpException, HttpBadRequestException {
         String builtUrl = String.format("%s/projects/%d/labels/%d/strings", this.url, projectId, labelId);
-        SourceStringResponseList response = this.httpClient.delete(builtUrl, new HttpRequestConfig(), SourceStringResponseList.class);
+        Map<String, Optional<Object>> queryParams = HttpRequestConfig.buildUrlParams("stringIds", Optional.ofNullable(stringIds == null ? null : stringIds.stream().map(String::valueOf).collect(Collectors.joining(","))));
+        SourceStringResponseList response = this.httpClient.delete(builtUrl, new HttpRequestConfig(queryParams), SourceStringResponseList.class);
         return SourceStringResponseList.to(response);
     }
 
diff --git a/src/test/java/com/crowdin/client/.DS_Store b/src/test/java/com/crowdin/client/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..b4d169ef6078b01c0591a731d73fd01e43442932
GIT binary patch
literal 6148
zcmeHKOAbLn5bQ=oVq<AJS8#)gZ~_-Vh>egC)^Fupj;8vv;jv>Q)k#my^mNT+YVrED
zi0JgPnTU);WB@mmn+<KVee;%eGNM2@&e+TOx;P#7$HT6b{XSsaK6oox%l3tDdo(IQ
z1*iZOpaN9jy9#7|9SpyFEKj2XRNxO3u<t{G8`i`o&_5j*yafRE5O%}ddkJ8%0I()D
zfr!8~sKB6Vwip_8#7pMY#3nH4qS<_C-mKZ7sNatBi>Hg$K#o*^3Op;&jpfMd{~Z3I
z|9>WNMFpt9Un!uy*<v=uld`t99%r?-z?X2#xx>vccM1kC$3QQ~SXen8ds5^Tn`6Hw
UHi1q@-0496445u7D)4Is9urs<nE(I)

literal 0
HcmV?d00001

diff --git a/src/test/java/com/crowdin/client/labels/LabelsApiTest.java b/src/test/java/com/crowdin/client/labels/LabelsApiTest.java
index cc306218a..0f2e684d7 100644
--- a/src/test/java/com/crowdin/client/labels/LabelsApiTest.java
+++ b/src/test/java/com/crowdin/client/labels/LabelsApiTest.java
@@ -28,39 +28,37 @@
 
 public class LabelsApiTest extends TestClient {
 
-    private final String apiFiles = "api/labels/";
-
-    private String file(String fileName) {
-        return apiFiles + fileName;
-    }
-
     private final Long projectId = 8L;
     private final String labelTitle = "main";
     private final Long labelId = 34L;
-    private final Map<String, Object> urlParams = new HashMap<String, Object>() {{
+
+    private final Map<String, Object> unassignLabelToScreenshotsUrlParams = new HashMap<String, Object>() {{
         put("screenshotIds", "1");
     }};
+    private final Map<String, Object> unassignLabelToStringTestUrlParams = new HashMap<String, Object>() {{
+        put("stringIds", "1");
+    }};
 
     @Override
     public List<RequestMock> getMocks() {
         return Arrays.asList(
-                RequestMock.build(String.format("%s/projects/%d/labels", this.url, projectId), HttpGet.METHOD_NAME,
-                        "api/labels/listLabels.json"),
-                RequestMock.build(String.format("%s/projects/%d/labels", this.url, projectId), HttpPost.METHOD_NAME,
-                        "api/labels/addLabelRequest.json", "api/labels/label.json"),
-                RequestMock.build(String.format("%s/projects/%d/labels/%d", this.url, projectId, labelId), HttpGet.METHOD_NAME,
-                        "api/labels/label.json"),
-                RequestMock.build(String.format("%s/projects/%d/labels/%d", this.url, projectId, labelId), HttpDelete.METHOD_NAME),
-                RequestMock.build(String.format("%s/projects/%d/labels/%d", this.url, projectId, labelId), HttpPatch.METHOD_NAME,
-                        "api/labels/editLabelRequest.json", "api/labels/label.json"),
-                RequestMock.build(String.format("%s/projects/%d/labels/%d/strings", this.url, projectId, labelId), HttpPost.METHOD_NAME,
-                        "api/labels/labelToStringsRequest.json", "api/labels/listStrings.json"),
-                RequestMock.build(String.format("%s/projects/%d/labels/%d/strings", this.url, projectId, labelId), HttpDelete.METHOD_NAME,
-                        "api/labels/listStrings.json"),
-                RequestMock.build(String.format("%s/projects/%d/labels/%d/screenshots", this.url, projectId, labelId), HttpPost.METHOD_NAME,
-                        "api/labels/labelToScreenshotsRequest.json", "api/labels/listScreenshots.json"),
-                RequestMock.build(String.format("%s/projects/%d/labels/%d/screenshots", this.url, projectId, labelId), HttpDelete.METHOD_NAME,
-                        "api/labels/listScreenshots.json", urlParams)
+            RequestMock.build(String.format("%s/projects/%d/labels", this.url, projectId), HttpGet.METHOD_NAME,
+                "api/labels/listLabels.json"),
+            RequestMock.build(String.format("%s/projects/%d/labels", this.url, projectId), HttpPost.METHOD_NAME,
+                "api/labels/addLabelRequest.json", "api/labels/label.json"),
+            RequestMock.build(String.format("%s/projects/%d/labels/%d", this.url, projectId, labelId), HttpGet.METHOD_NAME,
+                "api/labels/label.json"),
+            RequestMock.build(String.format("%s/projects/%d/labels/%d", this.url, projectId, labelId), HttpDelete.METHOD_NAME),
+            RequestMock.build(String.format("%s/projects/%d/labels/%d", this.url, projectId, labelId), HttpPatch.METHOD_NAME,
+                "api/labels/editLabelRequest.json", "api/labels/label.json"),
+            RequestMock.build(String.format("%s/projects/%d/labels/%d/strings", this.url, projectId, labelId), HttpPost.METHOD_NAME,
+                "api/labels/labelToStringsRequest.json", "api/labels/listStrings.json"),
+            RequestMock.build(String.format("%s/projects/%d/labels/%d/strings", this.url, projectId, labelId), HttpDelete.METHOD_NAME,
+                "api/labels/listStrings.json", unassignLabelToStringTestUrlParams),
+            RequestMock.build(String.format("%s/projects/%d/labels/%d/screenshots", this.url, projectId, labelId), HttpPost.METHOD_NAME,
+                "api/labels/labelToScreenshotsRequest.json", "api/labels/listScreenshots.json"),
+            RequestMock.build(String.format("%s/projects/%d/labels/%d/screenshots", this.url, projectId, labelId), HttpDelete.METHOD_NAME,
+                "api/labels/listScreenshots.json", unassignLabelToScreenshotsUrlParams)
         );
     }
 
@@ -117,8 +115,8 @@ public void assignLabelToStringTest() {
     }
 
     @Test
-    public void unassignLabelToStringTest() {
-        ResponseList<SourceString> response = this.getLabelsApi().unassignLabelFromStrings(projectId, labelId);
+    public void unassignLabelFromStringTest() {
+        ResponseList<SourceString> response = this.getLabelsApi().unassignLabelFromStrings(projectId, labelId, Arrays.asList(1L));
         assertEquals(1, response.getData().size());
     }
 
@@ -133,9 +131,7 @@ public void assignLabelToScreenshot() {
 
     @Test
     public void unassignLabelToScreenshot() {
-        List<Long> screenshotIds= Arrays.asList(1L);
-        ResponseList<Screenshot> response = this.getLabelsApi().unassignLabelFromScreenshots(projectId, labelId, screenshotIds);
+        ResponseList<Screenshot> response = this.getLabelsApi().unassignLabelFromScreenshots(projectId, labelId, Arrays.asList(1L));
         assertEquals(1, response.getData().size());
-
     }
 }