From a535303adda03742924e5e38e894fc93a66ae9ef Mon Sep 17 00:00:00 2001
From: vaneck237 <vaneckbilongo@gmail.com>
Date: Thu, 24 Jul 2025 16:45:23 +0100
Subject: [PATCH] fix fetch claims

---
 .DS_Store                                     | Bin 10244 -> 8196 bytes
 claimManagement/.DS_Store                     | Bin 10244 -> 6148 bytes
 .../org.openimis.imisclaim/GetClaims.graphql  |   3 +--
 .../imisclaims/SearchClaimsActivity.java      |   3 +--
 .../imisclaims/domain/entity/Claim.java       |   2 +-
 .../request/GetClaimsGraphQLRequest.java      |   2 --
 .../imisclaims/network/util/OkHttpUtils.java  |   3 +++
 .../imisclaims/usecase/FetchClaims.java       |   2 --
 8 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index d318267731fd9e1cff0d0f3c2ca94c211424591d..19d58b18a0dc77d57ec0acc12e1d43c2270cb2f1 100644
GIT binary patch
delta 630
zcmZn(XmOBWU|?W$DortDU;r^WfEYvza8FDWo2aMAsIoC&H$S7wWF7&DcqZq!kw7^X
z20ey!hD?T%+<X_8q@4UDkiHd63-36HA9qBRPl3ySt$)$0iY8x>VHlj8pIZRb!@zWY
z!Q^HEMJ7I%$;$-f*p=iJ6>bY3pZrlkc=9~~9wfda3*(a;`jgEB<=8cjmQ@FdAD`SP
zC_Fh&kcWMi)Ju>ZK)!rE<5RG)tU$MBGNdr1G9>1tBWz<}l>Q5}6iF7@FZ!SN3LS^I
z6-5QYH`rAm`G*A<sv9Qz3du1(nVcge#h!TOz`=+7$0zp+NyFLeg=CoyFih^3Qkv`|
z!owo<)&4S&qsK9ec@8)zfgBYfgq=vjN|R-!d6;Dx4@^EGT{HQHOh-L4LkUAJLjj5(
z88}V>{Rovo_FwwFoDVmgj)CF|E{m`SQx?fzKrI3c3P2JF7#+YAh}f7V$SlYV;Yx4=
cX;)AZ+L-vAc{0CBAO|BPVKHou=b6I{0K+(=m;e9(

literal 10244
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

diff --git a/claimManagement/.DS_Store b/claimManagement/.DS_Store
index fc486708eaf939aef96d14dc522dd988cee479d9..0798ffc31175ab8e8fb210e3b316add83ca65b76 100644
GIT binary patch
delta 207
zcmZn(XfcprU|?W$DortDU=RQ@Ie-{MGjUEV6q~50$SANeU^gS9z+@f)Y38e!-6v}a
zNU__r)X!8EKR(%8KpM`@6_8=Rp1?3ULC|3GeDUbXViLV_r>cM^F*6i16fq>{=DWBg
z<>V)U?C6i~KBO!@`JjXZ8<crpLW*(1#zG#J#q1m$g3LfgKp?;kBwRsm*;x3Uc{0C>
YBgnA~j0_AcAesr{TCmvWc%C`T023=M*8l(j

literal 10244
zcmeHMUu+ab7@u$ZZ`Uq#%HO42;iL+P)m~ey{8NwifR;ZNx&AL&?`{{mvbS4q_wEpE
zEYV0rpG1w(2MET51SOJy@kRU-mHMCwSTPboAAI1!@Z<|%jNk0+wRbJV7fp!lBs<^E
zeDlrB_q*RWvol8sf#$SYPe_muBI3g&l`*?XVtV#WNrG213nidEA*!*nKANzSLsQ!N
z6+Qw!0zLvh0zLvh0=EYOxM#B@mUHRnJ_0@hJ_6$iu=OE`50ha}j&SKN9hkXC0F=d8
z?IwK3bAW3T^kmqRBV4+s*e5?dfM*Kc5d*k6>VvE~%CIL#xa8&pxH$oDWbjTX;Es-V
zLAN=9FqeMrBj6)26#;g3FClS~COR<+&+k>gpFC8kO<Ivi+_2(UD~`6+y?ybWuh&j)
zq5eaQp}~n8g22_!(43T#1hH`j5u%YyJZlemV|*MRGIZMsg)V?lR9sS8CYFii;*-%q
zD;srUPTFpcrTST^!?KKc?mZUo(zWaWoz-HQPE0qolxv`?8aCP9t(&TqZMM>;YP+^k
zt`H?r8lcL)eGN^a+F;}Irs3M)zLgF5zPzz%cvuo=*VL`vHn7V`n$|%!X<TBwrHD-9
z<?;L#d@JzjCbuGmdOOp?eJ-lY`Ft_wvvgOvJWcNG>g<+#d-Q~5M)keg0Ijgm@ir`O
zO=%f)xI1AP>7;27(8@&2NTiLJqpdXz))?z5>_o~kjIEZfJGy1|_Bh%eC)ZJds;AGk
zQcjE8*#M<!Tid2#UwTH1V2{|<3^rQ(5bMV7(o#0cnsA6aFP)e^H*oj8%j%Y|e6(f5
zruMN4S~)|OXV2-*=(Zj=wBDGV&`eb~cXnoV)fwzV^i4<Kp=&8gs)ThNW-O_>R*F(J
zUleIgPdcvePV3IIV>2pgMfCzj-mc<Awpc2&Qt4??ay5$<C`v!mw4^l5RZ(=S7cWud
z4jVzBF|XnMwX)o?3u!=YiJOM%Wu?=I#WjPf5;uFONmjZu+&j9-t6a5OR(kMuD~VIK
zE1}k_ek`mgPqC3V$84v4NHcL(qu%fl)b-hev6R-HMJ9T+tyt^+f>_Ut)~UK<F(rdb
zQ5HNdioLAEwW_MAt{YpQU=~z2GdeOKA?E==&x@i|lOtYDco~0n-IG{o=O?zsR+GhK
z1#YPwWCyXxe)1|gOiqzc$Qkl2xj-(HE95G<My`_^<S!@!8K%K>pfC>>K^@dX12n=K
zXoWV|2vO*PKIn(-pusa>KoU&I!Z17!Bd{M1!fWt4ya8{*VK@fI;eGf3K7y~{ER4c8
za2_tfW%vcIz;(C*e+nf+sZb_V3RS`bLY)v2>V*bjwGa{7gpJ$*As1?W`3~XdM?aP)
zhmyB^2*+*_O08|J8|BTneJK4jov~r&tl4ws23bU{c%*rpe4MR0g67lS<$6JcxMXnS
zY7$AulzCP21J&}vTyXM`%nMNr5^ayjm`=-h>qYWCA_fU9;l(BLeIkYjE#<}9z=I+N
zBo*AETpwtZFzjd%FV+SgmP87?uu5JdVF1$NvH4Z=lt<;TObJ^6B;HdbuwKL<qW>1V
z&ykDdS7i4e<QkMhIdXa-EQJs>K^WG<2ITW5*aBV94ZX-}#_1g}2s-Qn2hzyvJ+K#E
zfEVE<H~=prw+|t^8MlwXQFs^LgA?!}oP<+w8qUC{@Hu<|Un1MTgCF5%xHO5wTM9W0
zS0{5gf18aQJ-7Rsbe3(i1w2n$6C3TV+T?Gw-k1e_WTGk4u*{vPWARmt9{@Uj3fKkP
z6{u`&AJ^s2?Z9Yf;JJYN36Q6snAgqp1#^NSHmxGu{8J=RFlzPpzfEZJ$2|VSTQje7
zJUqL6B&KQ$##?%XjprvH0UrS$0UrS$fjb(3BJO>V-T$w<_5c5OG)BJjJ_7%D1fVz)
zjWnZ|xl{IJhuK|w5TB><VTrXH;nFq1j5T5P?sYsC*me9;ug<$1a`j=aZiGwM9PM0l
al>9dTKmRkpKmX$;6+dbF=l?tN{Qoz5XBcS!

diff --git a/claimManagement/src/main/graphql/org.openimis.imisclaim/GetClaims.graphql b/claimManagement/src/main/graphql/org.openimis.imisclaim/GetClaims.graphql
index 66230f0a..f4354e92 100644
--- a/claimManagement/src/main/graphql/org.openimis.imisclaim/GetClaims.graphql
+++ b/claimManagement/src/main/graphql/org.openimis.imisclaim/GetClaims.graphql
@@ -1,6 +1,5 @@
-query GetClaims($claim_administrator_code: String, $status_claim: Int, $visit_date_from: Date, $visit_date_to: Date, $processed_date_from: Date, $processed_date_to: Date) {
+query GetClaims($status_claim: Int, $visit_date_from: Date, $visit_date_to: Date, $processed_date_from: Date, $processed_date_to: Date) {
   claims(
-    admin_Code: $claim_administrator_code
     status: $status_claim
     dateClaimed_Gte: $visit_date_from
     dateClaimed_Lte: $visit_date_to
diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/SearchClaimsActivity.java b/claimManagement/src/main/java/org/openimis/imisclaims/SearchClaimsActivity.java
index d201029d..9e863b79 100644
--- a/claimManagement/src/main/java/org/openimis/imisclaims/SearchClaimsActivity.java
+++ b/claimManagement/src/main/java/org/openimis/imisclaims/SearchClaimsActivity.java
@@ -156,8 +156,7 @@ private void getClaims(
         new Thread(() -> {
 
             try {
-                List<Claim> claims = new FetchClaims().execute(
-                        claimAdministratorCode, status, visitDateFrom,
+                List<Claim> claims = new FetchClaims().execute( status, visitDateFrom,
                         visitDateTo, processedDateFrom, processedDateTo
                 );
                 pd.dismiss();
diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Claim.java b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Claim.java
index 85f85803..65986297 100644
--- a/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Claim.java
+++ b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Claim.java
@@ -177,7 +177,7 @@ protected Claim(Parcel in) {
         if (in.readByte() == 0) {
             status = null;
         } else {
-            status = Claim.Status.valueOf(in.readString());
+            status = Status.valueOf(in.readString());
         }
     }
 
diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/network/request/GetClaimsGraphQLRequest.java b/claimManagement/src/main/java/org/openimis/imisclaims/network/request/GetClaimsGraphQLRequest.java
index 1cf0c4de..ee0a6369 100644
--- a/claimManagement/src/main/java/org/openimis/imisclaims/network/request/GetClaimsGraphQLRequest.java
+++ b/claimManagement/src/main/java/org/openimis/imisclaims/network/request/GetClaimsGraphQLRequest.java
@@ -15,7 +15,6 @@ public class GetClaimsGraphQLRequest extends BaseGraphQLRequest {
     @NonNull
     @WorkerThread
     public GetClaimsQuery.Claims get(
-            @Nullable String claimAdministratorCode,
             @Nullable Integer status,
             @Nullable Date visitDateFrom,
             @Nullable Date visitDateTo,
@@ -23,7 +22,6 @@ public GetClaimsQuery.Claims get(
             @Nullable Date processedDateTo
     ) throws Exception {
         return makeSynchronous(new GetClaimsQuery(
-                Input.fromNullable(claimAdministratorCode),
                 Input.fromNullable(status),
                 Input.fromNullable(visitDateFrom),
                 Input.fromNullable(visitDateTo),
diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/network/util/OkHttpUtils.java b/claimManagement/src/main/java/org/openimis/imisclaims/network/util/OkHttpUtils.java
index 3b59abed..c0d521f8 100644
--- a/claimManagement/src/main/java/org/openimis/imisclaims/network/util/OkHttpUtils.java
+++ b/claimManagement/src/main/java/org/openimis/imisclaims/network/util/OkHttpUtils.java
@@ -8,6 +8,8 @@
 import org.openimis.imisclaims.Global;
 import org.openimis.imisclaims.network.okhttp.AuthorizationInterceptor;
 
+import java.util.concurrent.TimeUnit;
+
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;
@@ -29,6 +31,7 @@ public static OkHttpClient getDefaultOkHttpClient() {
             synchronized (OkHttpUtils.class) {
                 if (client == null) {
                     OkHttpClient.Builder builder = new OkHttpClient.Builder();
+                    builder.readTimeout(2000, TimeUnit.SECONDS);
                     HttpLoggingInterceptor interceptor = new HttpLoggingInterceptor();
                     interceptor.setLevel(BuildConfig.DEBUG ? HttpLoggingInterceptor.Level.BODY : HttpLoggingInterceptor.Level.BASIC);
                     builder.addInterceptor(interceptor);
diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/usecase/FetchClaims.java b/claimManagement/src/main/java/org/openimis/imisclaims/usecase/FetchClaims.java
index 7a7f6e34..d7c8be95 100644
--- a/claimManagement/src/main/java/org/openimis/imisclaims/usecase/FetchClaims.java
+++ b/claimManagement/src/main/java/org/openimis/imisclaims/usecase/FetchClaims.java
@@ -31,7 +31,6 @@ public FetchClaims(
     @WorkerThread
     @NonNull
     public List<Claim> execute(
-            @Nullable String claimAdministratorCode,
             @Nullable Claim.Status status,
             @Nullable Date visitDateFrom,
             @Nullable Date visitDateTo,
@@ -41,7 +40,6 @@ public List<Claim> execute(
         Mapper<GetClaimsQuery.Service, Claim.Service> serviceMapper = new Mapper<>(this::toService);
         Mapper<GetClaimsQuery.Item, Claim.Medication> medicationMapper = new Mapper<>(this::toMedication);
         return Mapper.map(request.get(
-                claimAdministratorCode,
                 statusAsInt(status),
                 visitDateFrom,
                 visitDateTo,