userIdCode should come from system as an input parameter (#23)

* dynamic userId for services * version changed to 4.2.4
nortal · Oct 11, 2017 · 7ee6f94 · 7ee6f94
1 parent f4dfd73
commit 7ee6f94
Show file tree

Hide file tree

Showing 30 changed files with 249 additions and 23 deletions.
diff --git a/client-service/ariregv6/pom.xml b/client-service/ariregv6/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.nortal.jroad</groupId>
         <artifactId>xtee-client-service</artifactId>
-        <version>4.2.2</version>
+        <version>4.2.4</version>
     </parent>
 
     <properties>

diff --git a/...-service/ariregv6/src/main/java/com/nortal/jroad/client/ariregv6/Ariregv6XTeeService.java b/...-service/ariregv6/src/main/java/com/nortal/jroad/client/ariregv6/Ariregv6XTeeService.java
@@ -18,6 +18,17 @@ public List<DetailandmedV5Ettevotja> findDetailandmedV1Step2(final String jurisi
                                                                  boolean ainultKehtivad,
                                                                  long maksValjundArv) throws XRoadServiceConsumptionException;
 
+    public List<DetailandmedV5Ettevotja> findDetailandmedV1Step2(final String jurisikArk,
+                                                                 final String[] jurisikRollJadaArray,
+                                                                 boolean yldandmed,
+                                                                 boolean isikuandmed,
+                                                                 boolean menetlusesAvaldused,
+                                                                 boolean kommertspandiandmed,
+                                                                 boolean maarused,
+                                                                 boolean ainultKehtivad,
+                                                                 long maksValjundArv,
+                                                                 String userIdCode) throws XRoadServiceConsumptionException;
+
     public List<DetailandmedV5Ettevotja> findDetailandmedV1(final long ariregistriKood,
                                                             final String[] fyysIsikuRollideJada,
                                                             boolean yldandmed,
@@ -28,7 +39,18 @@ public List<DetailandmedV5Ettevotja> findDetailandmedV1(final long ariregistriKo
                                                             boolean ainultKehtivad,
                                                             long maksValjundArv) throws XRoadServiceConsumptionException;
 
-    public List<DetailandmedV5Ettevotja> findDetailandmedV1(final String fyysiliseIsikuKood,
+    public List<DetailandmedV5Ettevotja> findDetailandmedV1(final long ariregistriKood,
+                                                            final String[] fyysIsikuRollideJada,
+                                                            boolean yldandmed,
+                                                            boolean isikuandmed,
+                                                            boolean menetlusesAvaldused,
+                                                            boolean kommertspandiandmed,
+                                                            boolean maarused,
+                                                            boolean ainultKehtivad,
+                                                            long maksValjundArv,
+                                                            String userIdCode) throws XRoadServiceConsumptionException;
+
+    public List<DetailandmedV5Ettevotja> findDetailandmedV5(final String fyysiliseIsikuKood,
                                                             final String[] fyysIsikuRollideJada,
                                                             boolean yldandmed,
                                                             boolean isikuandmed,
@@ -37,5 +59,16 @@ public List<DetailandmedV5Ettevotja> findDetailandmedV1(final String fyysiliseIs
                                                             boolean maarused,
                                                             boolean ainultKehtivad,
                                                             long maksValjundArv) throws XRoadServiceConsumptionException;
+
+    public List<DetailandmedV5Ettevotja> findDetailandmedV5(final String fyysiliseIsikuKood,
+                                                            final String[] fyysIsikuRollideJada,
+                                                            boolean yldandmed,
+                                                            boolean isikuandmed,
+                                                            boolean menetlusesAvaldused,
+                                                            boolean kommertspandiandmed,
+                                                            boolean maarused,
+                                                            boolean ainultKehtivad,
+                                                            long maksValjundArv,
+                                                            String userIdCode) throws XRoadServiceConsumptionException;
 }
 
diff --git a/...vice/ariregv6/src/main/java/com/nortal/jroad/client/ariregv6/Ariregv6XTeeServiceImpl.java b/...vice/ariregv6/src/main/java/com/nortal/jroad/client/ariregv6/Ariregv6XTeeServiceImpl.java
@@ -5,6 +5,7 @@
 import com.nortal.jroad.client.ariregv6.types.eu.x_road.arireg.producer.DetailandmedV5Ettevotja;
 import com.nortal.jroad.client.ariregv6.types.eu.x_road.arireg.producer.DetailandmedV5Query;
 import com.nortal.jroad.client.exception.XRoadServiceConsumptionException;
+import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.math.BigInteger;
@@ -14,7 +15,8 @@
  * Created by raunor
  * on 11.04.2017.
  */
-public class Ariregv6XTeeServiceImpl {
+@Service("ariregv6XTeeService")
+public class Ariregv6XTeeServiceImpl implements Ariregv6XTeeService{
     @Resource
     private AriregXRoadDatabase ariregXRoadDatabase;
 
@@ -44,6 +46,34 @@ public List<DetailandmedV5Ettevotja> findDetailandmedV1Step2(final String jurisi
         return ariregXRoadDatabase.detailandmedV1V1(detailandmedV1).getKeha().getEttevotjad().getItemList();
     }
 
+    public List<DetailandmedV5Ettevotja> findDetailandmedV1Step2(final String jurisikArk,
+                                                                 final String[] jurisikRollJadaArray,
+                                                                 boolean yldandmed,
+                                                                 boolean isikuandmed,
+                                                                 boolean menetlusesAvaldused,
+                                                                 boolean kommertspandiandmed,
+                                                                 boolean maarused,
+                                                                 boolean ainultKehtivad,
+                                                                 long maksValjundArv,
+                                                                 String userIdCode) throws XRoadServiceConsumptionException{
+
+        DetailandmedV1 detailandmedV1 = DetailandmedV1.Factory.newInstance();
+        DetailandmedV5Query query = DetailandmedV5Query.Factory.newInstance();
+        query.setJurisikArk(jurisikArk);
+        query.setJurisikRollJadaArray(jurisikRollJadaArray);
+        query.setYandmed(yldandmed);
+        query.setIandmed(isikuandmed);
+        query.setDandmed(menetlusesAvaldused);
+        query.setKandmed(kommertspandiandmed);
+        query.setMaarused(maarused);
+        query.setAinultKehtivad(ainultKehtivad);
+        query.setEvarv(BigInteger.valueOf(maksValjundArv));
+        detailandmedV1.setKeha(query);
+
+        return ariregXRoadDatabase.detailandmedV1V1(detailandmedV1, userIdCode).getKeha().getEttevotjad().getItemList();
+    }
+
+
     public List<DetailandmedV5Ettevotja> findDetailandmedV1(final long ariregistriKood,
                                                             final String[] fyysIsikuRollideJada,
                                                             boolean yldandmed,
@@ -72,6 +102,35 @@ public List<DetailandmedV5Ettevotja> findDetailandmedV1(final long ariregistriKo
         return ariregXRoadDatabase.detailandmedV1V1(detailandmedV1).getKeha().getEttevotjad().getItemList();
     }
 
+    public List<DetailandmedV5Ettevotja> findDetailandmedV1(final long ariregistriKood,
+                                                            final String[] fyysIsikuRollideJada,
+                                                            boolean yldandmed,
+                                                            boolean isikuandmed,
+                                                            boolean menetlusesAvaldused,
+                                                            boolean kommertspandiandmed,
+                                                            boolean maarused,
+                                                            boolean ainultKehtivad,
+                                                            long maksValjundArv,
+                                                            String userIdCode) throws XRoadServiceConsumptionException {
+
+        DetailandmedV1 detailandmedV1 = DetailandmedV1.Factory.newInstance();
+        DetailandmedV5Query query = DetailandmedV5Query.Factory.newInstance();
+        query.setAriregistriKood(BigInteger.valueOf(ariregistriKood));
+        if(fyysIsikuRollideJada != null){
+            query.setFyysiliseIsikuRollJadaArray(fyysIsikuRollideJada);
+        }
+        query.setYandmed(yldandmed);
+        query.setIandmed(isikuandmed);
+        query.setDandmed(menetlusesAvaldused);
+        query.setKandmed(kommertspandiandmed);
+        query.setMaarused(maarused);
+        query.setAinultKehtivad(ainultKehtivad);
+        query.setEvarv(BigInteger.valueOf(maksValjundArv));
+        detailandmedV1.setKeha(query);
+
+        return ariregXRoadDatabase.detailandmedV1V1(detailandmedV1, userIdCode).getKeha().getEttevotjad().getItemList();
+    }
+
     public List<DetailandmedV5Ettevotja> findDetailandmedV5(final String fyysiliseIsikuKood,
                                                             final String[] fyysIsikuRollideJada,
                                                             boolean yldandmed,
@@ -99,4 +158,33 @@ public List<DetailandmedV5Ettevotja> findDetailandmedV5(final String fyysiliseIs
 
         return ariregXRoadDatabase.detailandmedV1V1(detailandmedV1).getKeha().getEttevotjad().getItemList();
     }
+
+    public List<DetailandmedV5Ettevotja> findDetailandmedV5(final String fyysiliseIsikuKood,
+                                                            final String[] fyysIsikuRollideJada,
+                                                            boolean yldandmed,
+                                                            boolean isikuandmed,
+                                                            boolean menetlusesAvaldused,
+                                                            boolean kommertspandiandmed,
+                                                            boolean maarused,
+                                                            boolean ainultKehtivad,
+                                                            long maksValjundArv,
+                                                            String userIdCode) throws XRoadServiceConsumptionException {
+
+        DetailandmedV1 detailandmedV1 = DetailandmedV1.Factory.newInstance();
+        DetailandmedV5Query query = DetailandmedV5Query.Factory.newInstance();
+        query.setFyysiliseIsikuKood(fyysiliseIsikuKood);
+        if(fyysIsikuRollideJada != null){
+            query.setFyysiliseIsikuRollJadaArray(fyysIsikuRollideJada);
+        }
+        query.setYandmed(yldandmed);
+        query.setIandmed(isikuandmed);
+        query.setDandmed(menetlusesAvaldused);
+        query.setKandmed(kommertspandiandmed);
+        query.setMaarused(maarused);
+        query.setAinultKehtivad(ainultKehtivad);
+        query.setEvarv(BigInteger.valueOf(maksValjundArv));
+        detailandmedV1.setKeha(query);
+
+        return ariregXRoadDatabase.detailandmedV1V1(detailandmedV1, userIdCode).getKeha().getEttevotjad().getItemList();
+    }
 }
diff --git a/client-service/digiluguv6/pom.xml b/client-service/digiluguv6/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.nortal.jroad</groupId>
     <artifactId>xtee-client-service</artifactId>
- 	  <version>4.2.2</version>
+ 	  <version>4.2.4</version>
   </parent>
 
   <properties>

diff --git a/client-service/emkis/pom.xml b/client-service/emkis/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.nortal.jroad</groupId>
     <artifactId>xtee-client-service</artifactId>
- 	<version>4.2.2</version>
+ 	<version>4.2.4</version>
   </parent>
 
   <properties>

diff --git a/client-service/emtav6/pom.xml b/client-service/emtav6/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.nortal.jroad</groupId>
     <artifactId>xtee-client-service</artifactId>
- 	<version>4.2.2</version>
+ 	<version>4.2.4</version>
   </parent>
 
   <properties>

diff --git a/client-service/evkrv6/pom.xml b/client-service/evkrv6/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.nortal.jroad</groupId>
         <artifactId>xtee-client-service</artifactId>
-        <version>4.2.2</version>
+        <version>4.2.4</version>
     </parent>
 
     <properties>

diff --git a/client-service/evkrv6/src/main/java/com/nortal/jroad/client/evkrv6/Evkrv6XTeeService.java b/client-service/evkrv6/src/main/java/com/nortal/jroad/client/evkrv6/Evkrv6XTeeService.java
@@ -14,4 +14,9 @@ public interface Evkrv6XTeeService {
     * <code>evkr.isiku_andmed_n.v1</code> service.
     */
     public IsikuAndmeteVastus findIsikuAndmednv1(Calendar alguskuupaev, String kood) throws XRoadServiceConsumptionException;
+
+    /**
+     * <code>evkr.isiku_andmed_n.v1</code> service.
+     */
+    public IsikuAndmeteVastus findIsikuAndmednv1(Calendar alguskuupaev, String kood, String userIdCode) throws XRoadServiceConsumptionException;
 }
diff --git a/...nt-service/evkrv6/src/main/java/com/nortal/jroad/client/evkrv6/Evkrv6XTeeServiceImpl.java b/...nt-service/evkrv6/src/main/java/com/nortal/jroad/client/evkrv6/Evkrv6XTeeServiceImpl.java
@@ -6,6 +6,7 @@
 import com.nortal.jroad.client.evkrv6.types.eu.x_road.evkr.IsikuAndmeteParing;
 import com.nortal.jroad.client.evkrv6.types.eu.x_road.evkr.IsikuAndmeteVastus;
 import com.nortal.jroad.client.exception.XRoadServiceConsumptionException;
+import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.Calendar;
@@ -14,7 +15,8 @@
  * Created by raunor
  * on 11.04.2017.
  */
-public class Evkrv6XTeeServiceImpl {
+@Service("evkrv6XTeeService")
+public class Evkrv6XTeeServiceImpl implements Evkrv6XTeeService{
     @Resource
     private EvkrXRoadDatabase evkrXTeeDatabase;
 
@@ -32,4 +34,19 @@ public IsikuAndmeteVastus findIsikuAndmednv1(Calendar alguskuupaev, String kood)
 
         return paringuVastus.getResponse();
     }
+
+    public IsikuAndmeteVastus findIsikuAndmednv1(Calendar alguskuupaev, String kood, String userIdCode) throws XRoadServiceConsumptionException {
+        IsikuAndmedNDocument.IsikuAndmedN andmedN = IsikuAndmedNDocument.IsikuAndmedN.Factory.newInstance();
+        IsikuAndmeteParing paring = IsikuAndmeteParing.Factory.newInstance();
+        paring.setAlguskuupaev(alguskuupaev);
+        IsikuAndmeteParing.Tapne tapne = IsikuAndmeteParing.Tapne.Factory.newInstance();
+        String[] koodArray = {kood};
+        tapne.setKoodArray(koodArray);
+        paring.setTapne(tapne);
+        andmedN.setRequest(paring);
+
+        IsikuAndmedNResponseDocument.IsikuAndmedNResponse paringuVastus = evkrXTeeDatabase.isikuAndmedNV1(andmedN, userIdCode);
+
+        return paringuVastus.getResponse();
+    }
 }
diff --git a/client-service/jvis/pom.xml b/client-service/jvis/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.nortal.jroad</groupId>
     <artifactId>xtee-client-service</artifactId>
-    <version>4.2.2</version>
+    <version>4.2.4</version>
   </parent>
 
   <properties>

diff --git a/client-service/krv6/pom.xml b/client-service/krv6/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.nortal.jroad</groupId>
         <artifactId>xtee-client-service</artifactId>
-        <version>4.2.2</version>
+        <version>4.2.4</version>
     </parent>
 
     <properties>

diff --git a/client-service/krv6/src/main/java/com/nortal/jroad/client/krv6/Krv6XTeeService.java b/client-service/krv6/src/main/java/com/nortal/jroad/client/krv6/Krv6XTeeService.java
@@ -17,4 +17,12 @@ KinnistuLihtandmedResponseDocument.KinnistuLihtandmedResponse findKinnistuLihtan
             String eesnimi, String perenimiJuriidilinenimi, String isikukood, Calendar synniaeg,
             Integer pageNr, Integer pageMaxRows)
             throws XRoadServiceConsumptionException;
+
+    /**
+     * <code>kr.kinnistu_lihtandmed_paring.v1</code> service
+     */
+    KinnistuLihtandmedResponseDocument.KinnistuLihtandmedResponse findKinnistuLihtandmed(
+            String eesnimi, String perenimiJuriidilinenimi, String isikukood, Calendar synniaeg,
+            Integer pageNr, Integer pageMaxRows, String userIdCode)
+            throws XRoadServiceConsumptionException;
 }
diff --git a/client-service/krv6/src/main/java/com/nortal/jroad/client/krv6/Krv6XTeeServiceImpl.java b/client-service/krv6/src/main/java/com/nortal/jroad/client/krv6/Krv6XTeeServiceImpl.java
@@ -38,4 +38,23 @@ public KinnistuLihtandmedResponseDocument.KinnistuLihtandmedResponse findKinnist
         return paringuVastus;
     }
 
+    public KinnistuLihtandmedResponseDocument.KinnistuLihtandmedResponse findKinnistuLihtandmed(
+            String eesnimi, String perenimiJuriidilinenimi, String isikukood, Calendar synniaeg,
+            Integer pageNr, Integer pageMaxRows, String userIdCode)
+            throws XRoadServiceConsumptionException {
+        KinnistuLihtandmedDocument.KinnistuLihtandmed lihtandmed = KinnistuLihtandmedDocument.KinnistuLihtandmed.Factory.newInstance();
+        KinnistuLihtandmedRequest request = KinnistuLihtandmedRequest.Factory.newInstance();
+        request.setEesnimi(eesnimi);
+        request.setNimi(perenimiJuriidilinenimi);
+        request.setKood(isikukood);
+        request.setSynniaeg(synniaeg);
+        request.setLehekyljeNr(pageNr);
+        request.setKinnistuteArvLehel(pageMaxRows);
+        lihtandmed.setRequest(request);
+        KinnistuLihtandmedResponseDocument.KinnistuLihtandmedResponse
+                paringuVastus = krv6XTeeDatabase.kinnistuLihtandmed(lihtandmed, userIdCode);
+
+        return paringuVastus;
+    }
+
 }
diff --git a/client-service/liiklusregisterv6/pom.xml b/client-service/liiklusregisterv6/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.nortal.jroad</groupId>
         <artifactId>xtee-client-service</artifactId>
-        <version>4.2.2</version>
+        <version>4.2.4</version>
     </parent>
 
     <properties>

diff --git a/...service/liiklusregisterv6/src/main/java/com/nortal/jroad/client/lrv6/Lrv6XTeeService.java b/...service/liiklusregisterv6/src/main/java/com/nortal/jroad/client/lrv6/Lrv6XTeeService.java
@@ -15,9 +15,21 @@ public interface Lrv6XTeeService {
      */
     VlaevResponse findVLaevAndmed(String regNr, String hinKood, String omaKood, String omaNimi, String omaEesnimi) throws XRoadServiceConsumptionException;
 
+    /**
+     * <code>liiklusregister.vlaev.v1</code>
+     */
+    VlaevResponse findVLaevAndmed(String regNr, String hinKood, String omaKood, String omaNimi, String omaEesnimi, String userIdCode) throws XRoadServiceConsumptionException;
+
+
     /**
      * <code>liiklusregister.soidukiandmed2.v1</code> X-tee service.
      * @return Soidukiandmed2Vastus
      */
     public Paring2Vastus findSoidukiAndmedParing2(String isikukood) throws XRoadServiceConsumptionException;
+
+    /**
+     * <code>liiklusregister.soidukiandmed2.v1</code> X-tee service.
+     * @return Soidukiandmed2Vastus
+     */
+    public Paring2Vastus findSoidukiAndmedParing2(String isikukood, String userIdCode) throws XRoadServiceConsumptionException;
 }