Merge pull request #392 from diadoc/ddcore-8775-get-organizations-by-inn-list

Ddcore 8775 get organizations by inn list

Author: kiryakovskb

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>ru.kontur.diadoc</groupId>
     <artifactId>diadocsdk</artifactId>
-    <version>4.3.0</version>
+    <version>4.4.0</version>
 
     <packaging>jar</packaging>
 

src/main/java/Diadoc/Api/organizations/OrganizationClient.java

@@ -116,6 +116,11 @@ public Organization getOrganizationByParameters(
 
 
 
+    /**
+     * @deprecated Method is deprecated
+     * Use {@link #getOrganizationsByInnListV2(String, Iterable)}
+     */
+    @Deprecated
     public OrganizationWithCounteragentStatus[] getOrganizationsByInnList(String myOrgId, Iterable<String> innList) throws DiadocSdkException {
         var request = GetOrganizationsByInnListRequest.newBuilder();
         request.addAllInnList(innList);
@@ -144,12 +149,18 @@ public OrganizationWithCounteragentStatus[] getOrganizationsByInnList(String myO
         }
     }
 
+    /**
+     * @deprecated Method is deprecated
+     * Use {@link #getOrganizationsByInnListV2(Iterable)}
+     */
+    @Deprecated
     public Organization[] getOrganizationsByInnList(Iterable<String> innList) throws DiadocSdkException {
         var request = GetOrganizationsByInnListRequest.newBuilder();
         request.addAllInnList(innList);
         return getOrganizationsByInnList(request.build());
     }
 
+
     public Organization[] getOrganizationsByInnList(GetOrganizationsByInnListRequest innListRequest) throws DiadocSdkException {
         if (innListRequest == null) {
             throw new IllegalArgumentException("innListRequest");
@@ -171,6 +182,61 @@ public Organization[] getOrganizationsByInnList(GetOrganizationsByInnListRequest
         }
     }
 
+    public OrganizationWithCounteragentStatus[] getOrganizationsByInnListV2(String myBoxId, Iterable<String> innList) throws DiadocSdkException {
+        var request = GetOrganizationsByInnListRequest.newBuilder();
+        request.addAllInnList(innList);
+        return getOrganizationsByInnListV2(myBoxId, request.build());
+    }
+
+    public OrganizationWithCounteragentStatus[] getOrganizationsByInnListV2(String myBoxId, GetOrganizationsByInnListRequest innListRequest) throws DiadocSdkException {
+        if (myBoxId == null)
+            throw new IllegalArgumentException("myBoxId");
+        if (innListRequest == null)
+            throw new IllegalArgumentException("innListRequest");
+        try {
+            var request = RequestBuilder.post(
+                            new URIBuilder(diadocHttpClient.getBaseUrl())
+                                    .setPath("/V2/GetOrganizationsByInnList")
+                                    .addParameter("myBoxId", myBoxId)
+                                    .build())
+                    .setEntity(new ByteArrayEntity(innListRequest.toByteArray()));
+
+
+            var response = GetOrganizationsByInnListResponse.parseFrom(diadocHttpClient.performRequest(request));
+            return response.getOrganizationsList().toArray(new OrganizationWithCounteragentStatus[0]);
+
+        } catch (URISyntaxException | IOException e) {
+            throw new DiadocSdkException(e);
+        }
+    }
+
+    public Organization[] getOrganizationsByInnListV2(Iterable<String> innList) throws DiadocSdkException {
+        var request = GetOrganizationsByInnListRequest.newBuilder();
+        request.addAllInnList(innList);
+        return getOrganizationsByInnListV2(request.build());
+    }
+
+    public Organization[] getOrganizationsByInnListV2(GetOrganizationsByInnListRequest innListRequest) throws DiadocSdkException {
+        if (innListRequest == null) {
+            throw new IllegalArgumentException("innListRequest");
+        }
+        try {
+            var request = RequestBuilder.post(
+                            new URIBuilder(diadocHttpClient.getBaseUrl())
+                                    .setPath("/V2/GetOrganizationsByInnList")
+                                    .build())
+                    .setEntity(new ByteArrayEntity(innListRequest.toByteArray()));
+            var response = GetOrganizationsByInnListResponse.parseFrom(diadocHttpClient.performRequest(request));
+            return response
+                    .getOrganizationsList()
+                    .stream()
+                    .map(OrganizationWithCounteragentStatus::getOrganization)
+                    .toArray(Organization[]::new);
+        } catch (URISyntaxException | IOException e) {
+            throw new DiadocSdkException(e);
+        }
+    }
+
     public OrganizationList getOrganizationsByInnKpp(String inn, @Nullable String kpp, boolean includeRelations) throws DiadocSdkException {
         if (inn == null) {
             throw new IllegalArgumentException("inn");