Skip to content

Commit 4e14db3

Browse files
committed
fix enquiring
1 parent 22c4ea4 commit 4e14db3

3 files changed

Lines changed: 10 additions & 2 deletions

File tree

claimManagement/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ android {
2727
minSdkVersion 23
2828
targetSdkVersion 32
2929
versionCode 4
30-
versionName "1.2.5"
30+
versionName "1.2.6"
3131
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
3232
}
3333
buildTypes {

claimManagement/src/main/graphql/org.openimis.imisclaim/GetInsureeInquire.graphql

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ query GetInsureeInquire($chfId: String) {
5656
expiryDate
5757
status
5858
value
59+
validityTo
5960
}
6061
}
6162
}

claimManagement/src/main/java/org/openimis/imisclaims/usecase/FetchInsureeInquire.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import org.openimis.imisclaims.network.request.GetInsureeInquireGraphQLRequest;
1313
import org.openimis.imisclaims.network.util.Mapper;
1414

15+
import java.util.ArrayList;
1516
import java.util.List;
1617
import java.util.Objects;
1718

@@ -32,14 +33,20 @@ public FetchInsureeInquire(@NonNull GetInsureeInquireGraphQLRequest request) {
3233
@WorkerThread
3334
public Insuree execute(@NonNull String chfId) throws Exception {
3435
GetInsureeInquireQuery.Node node = request.get(chfId);
36+
List<GetInsureeInquireQuery.Edge1> policies = new ArrayList<>();
37+
for (GetInsureeInquireQuery.Edge1 policy : node.insureePolicies().edges()){
38+
if(policy.node().policy().validityTo() == null){
39+
policies.add(policy);
40+
}
41+
}
3542
return new Insuree(
3643
/* chfId = */ Objects.requireNonNull(node.chfId()),
3744
/* name = */ node.lastName() + " " + node.otherNames(),
3845
/* dateOfBirth = */ node.dob(),
3946
/* gender = */ node.gender() != null ? node.gender().gender() : null,
4047
/* photoPath = */ getPhotoPath(node.photos()),
4148
/* photo = */ getPhotoBytes(node.photos()),
42-
/* policies = */ Mapper.map(node.insureePolicies().edges(), this::toPolicy),
49+
/* policies = */ Mapper.map(policies , this::toPolicy),
4350
/* familyUuid = */ node.family() != null ? node.family().uuid() : null
4451
);
4552
}

0 commit comments

Comments
 (0)