ingore not found for person

navikt · Feb 9, 2021 · acac743 · acac743
1 parent 6bddfc3
commit acac743
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 0 deletions.
diff --git a/...rasjon/pdl-klient/src/main/java/no/nav/vedtak/felles/integrasjon/pdl/JerseyPdlKlient.java b/...rasjon/pdl-klient/src/main/java/no/nav/vedtak/felles/integrasjon/pdl/JerseyPdlKlient.java
@@ -2,6 +2,7 @@
 
 import static javax.ws.rs.client.Entity.json;
 import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE;
+import static org.apache.http.HttpStatus.SC_NOT_FOUND;
 
 import java.net.URI;
 import java.util.List;
@@ -96,6 +97,18 @@ public Person hentPerson(HentPersonQueryRequest q, PersonResponseProjection p) {
         return query(q, p, HentPersonQueryResponse.class).hentPerson();
     }
 
+    @Override
+    public Person hentPerson(HentPersonQueryRequest q, PersonResponseProjection p, boolean ignoreNotFound) {
+        try {
+            return hentPerson(q, p);
+        } catch (PdlException e) {
+            if (e.getStatus() == SC_NOT_FOUND && ignoreNotFound) {
+                return null;
+            }
+            throw e;
+        }
+    }
+
     @Override
     public Identliste hentIdenter(HentIdenterQueryRequest q, IdentlisteResponseProjection p) {
         return query(q, p, HentIdenterQueryResponse.class).hentIdenter();
@@ -130,4 +143,5 @@ private <T extends GraphQLResult<?>> T query(GraphQLRequest req, Class<T> clazz)
             throw e;
         }
     }
+
 }
diff --git a/integrasjon/pdl-klient/src/main/java/no/nav/vedtak/felles/integrasjon/pdl/Pdl.java b/integrasjon/pdl-klient/src/main/java/no/nav/vedtak/felles/integrasjon/pdl/Pdl.java
@@ -53,6 +53,8 @@ public interface Pdl extends GraphQLQueryable {
 
     Person hentPerson(HentPersonQueryRequest q, PersonResponseProjection p);
 
+    Person hentPerson(HentPersonQueryRequest q, PersonResponseProjection p, boolean ignoreNotFound);
+
     GeografiskTilknytning hentGT(HentGeografiskTilknytningQueryRequest q, GeografiskTilknytningResponseProjection p);
 
     private Optional<String> hentId(String id, IdentGruppe gruppe, boolean ignoreNotFound) {

diff --git a/integrasjon/pdl-klient/src/main/java/no/nav/vedtak/felles/integrasjon/pdl/PdlKlient.java b/integrasjon/pdl-klient/src/main/java/no/nav/vedtak/felles/integrasjon/pdl/PdlKlient.java
@@ -9,6 +9,7 @@
 import static com.fasterxml.jackson.databind.SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS;
 import static org.apache.http.HttpStatus.SC_ACCEPTED;
 import static org.apache.http.HttpStatus.SC_INTERNAL_SERVER_ERROR;
+import static org.apache.http.HttpStatus.SC_NOT_FOUND;
 import static org.apache.http.HttpStatus.SC_NOT_MODIFIED;
 import static org.apache.http.HttpStatus.SC_NO_CONTENT;
 
@@ -178,4 +179,16 @@ public String toString() {
         return getClass().getSimpleName() + " [endpoint=" + endpoint + ", restKlient=" + restKlient + ", errorHandler=" + errorHandler + "]";
     }
 
+    @Override
+    public Person hentPerson(HentPersonQueryRequest q, PersonResponseProjection p, boolean ignoreNotFound) {
+        try {
+            return hentPerson(q, p);
+        } catch (PdlException e) {
+            if (e.getStatus() == SC_NOT_FOUND && ignoreNotFound) {
+                return null;
+            }
+            throw e;
+        }
+    }
+
 }