Manual test data integration completed.

diff --git a/lis-services/src/main/java/hu/user/lis/services/data/AssociateServiceImpl.java b/lis-services/src/main/java/hu/user/lis/services/data/AssociateServiceImpl.java
index 6703b883f062012c9047f586a2f0e4b95b2eb418..8bc3e6538d0369237829ebc70db0a2fbb53f272c 100644 (file)
--- a/lis-services/src/main/java/hu/user/lis/services/data/AssociateServiceImpl.java
+++ b/lis-services/src/main/java/hu/user/lis/services/data/AssociateServiceImpl.java
@@ -25,7 +25,7 @@ public class AssociateServiceImpl extends DataServiceImpl<Associate> implements
     @Override
     public List<Associate> getAll() {
         if (entities == null) {
-            entities = generate();
+            entities = generate2();
         }
         return entities;
     }
@@ -77,4 +77,52 @@ public class AssociateServiceImpl extends DataServiceImpl<Associate> implements
         return result;
     }
 
+    private List<Associate> generate2() {
+        List<Associate> result = new ArrayList<>();
+
+       String id = RandomStringUtils.random(8, "0123456789abcdef");
+       String name = "Kosztolányi Árpád";
+       String login = "user1";
+       String password = "password";
+       Associate entity = Associate.builder().active(true).id(id).name(name).login(login).password(password).build();
+       result.add(entity);
+
+        id = RandomStringUtils.random(8, "0123456789abcdef");
+        name = "Lévai Tibor";
+        login = "user2";
+        password = "password";
+        entity = Associate.builder().active(true).id(id).name(name).login(login).password(password).build();
+        result.add(entity);
+
+        id = RandomStringUtils.random(8, "0123456789abcdef");
+        name = "Szabó Marcell";
+        login = "user3";
+        password = "password";
+        entity = Associate.builder().active(true).id(id).name(name).login(login).password(password).build();
+        result.add(entity);
+
+        id = RandomStringUtils.random(8, "0123456789abcdef");
+        name = "Gulyás Csaba";
+        login = "user4";
+        password = "password";
+        entity = Associate.builder().active(true).id(id).name(name).login(login).password(password).build();
+        result.add(entity);
+
+        id = RandomStringUtils.random(8, "0123456789abcdef");
+        name = "Lévai Csilla";
+        login = "user5";
+        password = "password";
+        entity = Associate.builder().active(true).id(id).name(name).login(login).password(password).build();
+        result.add(entity);
+
+        id = RandomStringUtils.random(8, "0123456789abcdef");
+        name = "Vajda Krisztina";
+        login = "user6";
+        password = "password";
+        entity = Associate.builder().active(true).id(id).name(name).login(login).password(password).build();
+        result.add(entity);
+
+        return result;
+    }
+
 }

diff --git a/lis-services/src/main/java/hu/user/lis/services/data/InvoiceService.java b/lis-services/src/main/java/hu/user/lis/services/data/InvoiceService.java
index 973b79ebe3a84d0e70b44f8af16097f50ff12f29..34e64f154eb7a0f0f7a854addd6cac2d0ae116d4 100644 (file)
--- a/lis-services/src/main/java/hu/user/lis/services/data/InvoiceService.java
+++ b/lis-services/src/main/java/hu/user/lis/services/data/InvoiceService.java
@@ -20,4 +20,12 @@ public interface InvoiceService {
     void replace(Invoice targetEntity, Invoice replacementEntity);
 
     List<Invoice> getRandom(boolean income);
+
+    Invoice getById(String id);
+
+    Invoice getByHumanId(String id);
+
+    List<Invoice> getByHumanIds(String[] ids);
+
+
 }

diff --git a/lis-services/src/main/java/hu/user/lis/services/data/InvoiceServiceImpl.java b/lis-services/src/main/java/hu/user/lis/services/data/InvoiceServiceImpl.java
index 9854630f805750b1c0bbc1cafc0f7f6a27775cae..f77d8aad45f121c365113fb48d82b5cc6216daaa 100644 (file)
--- a/lis-services/src/main/java/hu/user/lis/services/data/InvoiceServiceImpl.java
+++ b/lis-services/src/main/java/hu/user/lis/services/data/InvoiceServiceImpl.java
@@ -4,6 +4,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import hu.user.lis.db.Currency;
 import hu.user.lis.db.Invoice;
 import hu.user.lis.db.Partner;
+import hu.user.lis.db.Project;
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.RandomUtils;
@@ -18,6 +19,7 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 @Service
 @Log4j2
@@ -36,14 +38,14 @@ public class InvoiceServiceImpl extends DataServiceImpl<Invoice> implements Invo
     public List<Invoice> getAll() {
         if (incomingEntities == null) {
             try {
-                incomingEntities = generate(true);
+                incomingEntities = generate2(true);
             } catch (ParseException e) {
                 throw new RuntimeException(e);
             }
         }
         if (outgoingEntities == null) {
             try {
-                outgoingEntities = generate(false);
+                outgoingEntities = generate2(false);
             } catch (ParseException e) {
                 throw new RuntimeException(e);
             }
@@ -108,647 +110,716 @@ public class InvoiceServiceImpl extends DataServiceImpl<Invoice> implements Invo
     }
 
     private List<Invoice> generate2(boolean income) throws ParseException {
-        List<Invoice> result = new ArrayList<>();
 
+        List<Invoice> result = new ArrayList<>();
         SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
 
-        String id = "VSz-2023/00070-";                                  // szamla sorszam
-        String title = "IBM és HP diszkek szállíása régi szerverbe";    // 2022-0027
-        Partner partner = partnerService.getRandom();                   // 001
-        Date completionDate = formatter.parse("2023-02-22");
-        Date createDate = formatter.parse("2023-02-22");
-        Date paymentDeadline = formatter.parse("2023-03-24");
-        Currency currency = Currency.EUR;
-        double netAmount = 780.00;
-        double grossAmount = netAmount * 1.27;
-        double vatAmount = grossAmount - netAmount;
-        Invoice entity = Invoice.builder()
-                .id(id)
-                .title(title)
-                .currency(currency)
-                .partner(partner)
-                .completionDate(completionDate)
-                .createDate(createDate)
-                .paymentDeadline(paymentDeadline)
-                .netAmount(netAmount)
-                .grossAmount(grossAmount)
-                .vatAmount(vatAmount)
-                .income(false)                     // bejovo szamla
-                .build();
-        result.add(entity);
-
-
-        id = "USER-2023-7";                                    // szamla sorszam
-        title = "IBM és HP diszkek szállíása régi szerverbe";  // 2022-0027
-        partner = partnerService.getRandom();                  // 002
-        completionDate = formatter.parse("2023-02-23");
-        createDate = formatter.parse("2023-02-23");
-        paymentDeadline = formatter.parse("2023-03-25");
-        currency = Currency.HUF;
-        netAmount = 338910.00;
-        grossAmount = netAmount * 1.27;
-        vatAmount = grossAmount - netAmount;
-        entity = Invoice.builder()
-                .id(id)
-                .title(title)
-                .currency(currency)
-                .partner(partner)
-                .completionDate(completionDate)
-                .createDate(createDate)
-                .paymentDeadline(paymentDeadline)
-                .netAmount(netAmount)
-                .grossAmount(grossAmount)
-                .vatAmount(vatAmount)
-                .income(true)                     // kimeno szamla
-                .build();
-        result.add(entity);
-
-        id = "582-SPI1003006-3021";                          // szamla sorszam
-        title = "IBM Power szerver garanciakiterjesztése";   // 2020-0109
-        partner = partnerService.getRandom();                // 004
-        completionDate = formatter.parse("2020-12-22");
-        createDate = formatter.parse("2020-12-22");
-        paymentDeadline = formatter.parse("2021-02-10");
-        currency = Currency.HUF;
-        netAmount = 10665107.00;
-        grossAmount = netAmount * 1.27;
-        vatAmount = grossAmount - netAmount;
-        entity = Invoice.builder()
-                .id(id)
-                .title(title)
-                .currency(currency)
-                .partner(partner)
-                .completionDate(completionDate)
-                .createDate(createDate)
-                .paymentDeadline(paymentDeadline)
-                .netAmount(netAmount)
-                .grossAmount(grossAmount)
-                .vatAmount(vatAmount)
-                .income(false)                     // bejovo szamla
-                .build();
-        result.add(entity);
-
-        id = "582-SPI003118";                                 // szamla sorszam
-        title = "IBM Power szerver garanciakiterjesztése";    // 2020-0109
-        partner = partnerService.getRandom();                 // 004
-        completionDate = formatter.parse("2020-12-31");
-        createDate = formatter.parse("2020-12-31");
-        paymentDeadline = formatter.parse("2021-03-31");
-        currency = Currency.USD;
-        netAmount = 224113.70;
-        grossAmount = netAmount * 1.27;
-        vatAmount = grossAmount - netAmount;
-        entity = Invoice.builder()
-                .id(id)
-                .title(title)
-                .currency(currency)
-                .partner(partner)
-                .completionDate(completionDate)
-                .createDate(createDate)
-                .paymentDeadline(paymentDeadline)
-                .netAmount(netAmount)
-                .grossAmount(grossAmount)
-                .vatAmount(vatAmount)
-                .income(false)                     // bejovo szamla
-                .build();
-        result.add(entity);
-
-        id = "582-SPI003680";                               // szamla sorszam
-        title = "IBM Power szerver garanciakiterjesztése";  // 2020-0109
-        partner = partnerService.getRandom();               // 004
-        completionDate = formatter.parse("2021-03-08");
-        createDate = formatter.parse("2021-03-08");
-        paymentDeadline = formatter.parse("2021-04-27");
-        currency = Currency.USD;
-        netAmount = 50298.61;
-        grossAmount = netAmount * 1.27;
-        vatAmount = grossAmount - netAmount;
-        entity = Invoice.builder()
-                .id(id)
-                .title(title)
-                .currency(currency)
-                .partner(partner)
-                .completionDate(completionDate)
-                .createDate(createDate)
-                .paymentDeadline(paymentDeadline)
-                .netAmount(netAmount)
-                .grossAmount(grossAmount)
-                .vatAmount(vatAmount)
-                .income(false)                     // bejovo szamla
-                .build();
-        result.add(entity);
-
-        id = "582-SPI003681";                               // szamla sorszam
-        title = "IBM Power szerver garanciakiterjesztése";  // 2020-0109
-        partner = partnerService.getRandom();               // 004
-        completionDate = formatter.parse("2021-03-08");
-        createDate = formatter.parse("2021-03-08");
-        paymentDeadline = formatter.parse("2021-04-27");
-        currency = Currency.USD;
-        netAmount = 13638.76;
-        grossAmount = netAmount * 1.27;
-        vatAmount = grossAmount - netAmount;
-        entity = Invoice.builder()
-                .id(id)
-                .title(title)
-                .currency(currency)
-                .partner(partner)
-                .completionDate(completionDate)
-                .createDate(createDate)
-                .paymentDeadline(paymentDeadline)
-                .netAmount(netAmount)
-                .grossAmount(grossAmount)
-                .vatAmount(vatAmount)
-                .income(false)                     // bejovo szamla
-                .build();
-        result.add(entity);
-
-        id = "582-SPI004090";                               // szamla sorszam
-        title = "IBM Power szerver garanciakiterjesztése";  // 2020-0109
-        partner = partnerService.getRandom();               // 004
-        completionDate = formatter.parse("2021-04-19");
-        createDate = formatter.parse("2021-04-19");
-        paymentDeadline = formatter.parse("2021-06-08");
-        currency = Currency.USD;
-        netAmount = 1017.61;
-        grossAmount = netAmount * 1.27;
-        vatAmount = grossAmount - netAmount;
-        entity = Invoice.builder()
-                .id(id)
-                .title(title)
-                .currency(currency)
-                .partner(partner)
-                .completionDate(completionDate)
-                .createDate(createDate)
-                .paymentDeadline(paymentDeadline)
-                .netAmount(netAmount)
-                .grossAmount(grossAmount)
-                .vatAmount(vatAmount)
-                .income(false)                     // bejovo szamla
-                .build();
-        result.add(entity);
-
-        id = "9090010764";                                  // szamla sorszam
-        title = "IBM Power szerver garanciakiterjesztése";  // 2020-0109
-        partner = partnerService.getRandom();               // 005
-        completionDate = formatter.parse("2020-12-31");
-        createDate = formatter.parse("2020-12-31");
-        paymentDeadline = formatter.parse("2021-03-01");
-        currency = Currency.HUF;
-        netAmount = 2054165.00;
-        grossAmount = netAmount * 1.27;
-        vatAmount = grossAmount - netAmount;
-        entity = Invoice.builder()
-                .id(id)
-                .title(title)
-                .currency(currency)
-                .partner(partner)
-                .completionDate(completionDate)
-                .createDate(createDate)
-                .paymentDeadline(paymentDeadline)
-                .netAmount(netAmount)
-                .grossAmount(grossAmount)
-                .vatAmount(vatAmount)
-                .income(false)                     // bejovo szamla
-                .build();
-        result.add(entity);
-
-        id = "VSz-2021/00091";                                  // szamla sorszam
-        title = "IBM Power szerver garanciakiterjesztése";      // 2020-0109
-        partner = partnerService.getRandom();                   // 006
-        completionDate = formatter.parse("2021-02-10");
-        createDate = formatter.parse("2021-02-18");
-        paymentDeadline = formatter.parse("2021-03-20");
-        currency = Currency.HUF;
-        netAmount = 6142818.00;
-        grossAmount = netAmount * 1.27;
-        vatAmount = grossAmount - netAmount;
-        entity = Invoice.builder()
-                .id(id)
-                .title(title)
-                .currency(currency)
-                .partner(partner)
-                .completionDate(completionDate)
-                .createDate(createDate)
-                .paymentDeadline(paymentDeadline)
-                .netAmount(netAmount)
-                .grossAmount(grossAmount)
-                .vatAmount(vatAmount)
-                .income(false)                     // bejovo szamla
-                .build();
-        result.add(entity);
-
-        id = "2021/0001";                                  // szamla sorszam
-        title = "IBM Power szerver garanciakiterjesztése";      // 2020-0109
-        partner = partnerService.getRandom();                   // 007
-        completionDate = formatter.parse("2020-12-31");
-        createDate = formatter.parse("2021-01-04");
-        paymentDeadline = formatter.parse("2021-04-04");
-        currency = Currency.HUF;
-        netAmount = 81000000.00;
-        grossAmount = netAmount * 1.27;
-        vatAmount = grossAmount - netAmount;
-        entity = Invoice.builder()
-                .id(id)
-                .title(title)
-                .currency(currency)
-                .partner(partner)
-                .completionDate(completionDate)
-                .createDate(createDate)
-                .paymentDeadline(paymentDeadline)
-                .netAmount(netAmount)
-                .grossAmount(grossAmount)
-                .vatAmount(vatAmount)
-                .income(true)                     // kimeno szamla
-                .build();
-        result.add(entity);
-
-        id = "2021/0069";                                  // szamla sorszam
-        title = "IBM Power szerver garanciakiterjesztése";      // 2020-0109
-        partner = partnerService.getRandom();                   // 007
-        completionDate = formatter.parse("2021-03-09");
-        createDate = formatter.parse("2021-03-10");
-        paymentDeadline = formatter.parse("2021-06-08.");
-        currency = Currency.HUF;
-        netAmount = 47636271.00;
-        grossAmount = netAmount * 1.27;
-        vatAmount = grossAmount - netAmount;
-        entity = Invoice.builder()
-                .id(id)
-                .title(title)
-                .currency(currency)
-                .partner(partner)
-                .completionDate(completionDate)
-                .createDate(createDate)
-                .paymentDeadline(paymentDeadline)
-                .netAmount(netAmount)
-                .grossAmount(grossAmount)
-                .vatAmount(vatAmount)
-                .income(true)                     // kimeno szamla
-                .build();
-        result.add(entity);
-
-        id = "EURSZLA0177/2022";                           // szamla sorszam
-        title = "Multivendor 2023 évre";                   // 2022-0227
-        partner = partnerService.getRandom();              // 008
-        completionDate = formatter.parse("2022-12-30");
-        createDate = formatter.parse("2022-12-30");
-        paymentDeadline = formatter.parse("2023-01-31");
-        currency = Currency.EUR;
-        netAmount = 2375.10;
-        grossAmount = netAmount * 1.27;
-        vatAmount = grossAmount - netAmount;
-        entity = Invoice.builder()
-                .id(id)
-                .title(title)
-                .currency(currency)
-                .partner(partner)
-                .completionDate(completionDate)
-                .createDate(createDate)
-                .paymentDeadline(paymentDeadline)
-                .netAmount(netAmount)
-                .grossAmount(grossAmount)
-                .vatAmount(vatAmount)
-                .income(false)                     // bejovo szamla
-                .build();
-        result.add(entity);
-
-
-        id = "19044";                                       // szamla sorszam
-        title = "Multivendor 2023 évre";                   // 2022-0227
-        partner = partnerService.getRandom();              // 009
-        completionDate = formatter.parse("2022-12-22");
-        createDate = formatter.parse("2022-12-22");
-        paymentDeadline = formatter.parse("2023-01-26");
-        currency = Currency.EUR;
-        netAmount = 390.00;
-        grossAmount = netAmount * 1.27;             // Ez a számla ÁFA-mentes !!!!
-        vatAmount = grossAmount - netAmount;
-        entity = Invoice.builder()
-                .id(id)
-                .title(title)
-                .currency(currency)
-                .partner(partner)
-                .completionDate(completionDate)
-                .createDate(createDate)
-                .paymentDeadline(paymentDeadline)
-                .netAmount(netAmount)
-                .grossAmount(grossAmount)
-                .vatAmount(vatAmount)
-                .income(false)                     // bejovo szamla
-                .build();
-        result.add(entity);
-
-        id = "9171058452";                                       // szamla sorszam
-        title = "Multivendor 2023 évre";                   // 2022-0227
-        partner = partnerService.getRandom();              // 010
-        completionDate = formatter.parse("2022-12-30");
-        createDate = formatter.parse("2023-01-13");
-        paymentDeadline = formatter.parse("2023-02-12");
-        currency = Currency.USD;
-        netAmount = 22490.00;
-        grossAmount = netAmount * 1.27;
-        vatAmount = grossAmount - netAmount;
-        entity = Invoice.builder()
-                .id(id)
-                .title(title)
-                .currency(currency)
-                .partner(partner)
-                .completionDate(completionDate)
-                .createDate(createDate)
-                .paymentDeadline(paymentDeadline)
-                .netAmount(netAmount)
-                .grossAmount(grossAmount)
-                .vatAmount(vatAmount)
-                .income(false)                     // bejovo szamla
-                .build();
-        result.add(entity);
-
-        id = "9171058628";                                       // szamla sorszam
-        title = "Multivendor 2023 évre";                   // 2022-0227
-        partner = partnerService.getRandom();              // 010
-        completionDate = formatter.parse("2023-01-12");
-        createDate = formatter.parse("2023-01-19");
-        paymentDeadline = formatter.parse("2023-02-18");
-        currency = Currency.USD;
-        netAmount = 30.00;
-        grossAmount = netAmount * 1.27;
-        vatAmount = grossAmount - netAmount;
-        entity = Invoice.builder()
-                .id(id)
-                .title(title)
-                .currency(currency)
-                .partner(partner)
-                .completionDate(completionDate)
-                .createDate(createDate)
-                .paymentDeadline(paymentDeadline)
-                .netAmount(netAmount)
-                .grossAmount(grossAmount)
-                .vatAmount(vatAmount)
-                .income(false)                     // bejovo szamla
-                .build();
-        result.add(entity);
-
-        id = "9171058628";                                       // szamla sorszam
-        title = "Multivendor 2023 évre";                   // 2022-0227
-        partner = partnerService.getRandom();              // 011
-        completionDate = formatter.parse("2022-12-23");
-        createDate = formatter.parse("2022-12-23");
-        paymentDeadline = formatter.parse("2023-01-07");
-        currency = Currency.EUR;
-        netAmount = 9500.00;
-        grossAmount = netAmount * 1.27;
-        vatAmount = grossAmount - netAmount;
-        entity = Invoice.builder()
-                .id(id)
-                .title(title)
-                .currency(currency)
-                .partner(partner)
-                .completionDate(completionDate)
-                .createDate(createDate)
-                .paymentDeadline(paymentDeadline)
-                .netAmount(netAmount)
-                .grossAmount(grossAmount)
-                .vatAmount(vatAmount)
-                .income(false)                     // bejovo szamla
-                .build();
-        result.add(entity);
-
-
-        id = "2022-SOV/000495";                                       // szamla sorszam
-        title = "Multivendor 2023 évre";                   // 2022-0227
-        partner = partnerService.getRandom();              // 012
-        completionDate = formatter.parse("2022-12-31");
-        createDate = formatter.parse("2022-12-31");
-        paymentDeadline = formatter.parse("2023-01-30");
-        currency = Currency.EUR;
-        netAmount = 44490.03;
-        grossAmount = netAmount * 1.27;
-        vatAmount = grossAmount - netAmount;
-        entity = Invoice.builder()
-                .id(id)
-                .title(title)
-                .currency(currency)
-                .partner(partner)
-                .completionDate(completionDate)
-                .createDate(createDate)
-                .paymentDeadline(paymentDeadline)
-                .netAmount(netAmount)
-                .grossAmount(grossAmount)
-                .vatAmount(vatAmount)
-                .income(false)                     // bejovo szamla
-                .build();
-        result.add(entity);
-
-        id = "2022-SOV/000496";                            // szamla sorszam
-        title = "Multivendor 2023 évre";                   // 2022-0227
-        partner = partnerService.getRandom();              // 012
-        completionDate = formatter.parse("2022-12-31");
-        createDate = formatter.parse("2022-12-31");
-        paymentDeadline = formatter.parse("2023-01-30");
-        currency = Currency.USD;
-        netAmount = 21657.29;
-        grossAmount = netAmount * 1.27;
-        vatAmount = grossAmount - netAmount;
-        entity = Invoice.builder()
-                .id(id)
-                .title(title)
-                .currency(currency)
-                .partner(partner)
-                .completionDate(completionDate)
-                .createDate(createDate)
-                .paymentDeadline(paymentDeadline)
-                .netAmount(netAmount)
-                .grossAmount(grossAmount)
-                .vatAmount(vatAmount)
-                .income(false)                     // bejovo szamla
-                .build();
-        result.add(entity);
-
-
-        id = "E-SYMPR-2022-105";                            // szamla sorszam
-        title = "Multivendor 2023 évre";                   // 2022-0227
-        partner = partnerService.getRandom();              // 013
-        completionDate = formatter.parse("2022-12-28");
-        createDate = formatter.parse("2022-12-28");
-        paymentDeadline = formatter.parse("2023-01-27");
-        currency = Currency.EUR;
-        netAmount = 52508.92;
-        grossAmount = netAmount * 1.27;
-        vatAmount = grossAmount - netAmount;
-        entity = Invoice.builder()
-                .id(id)
-                .title(title)
-                .currency(currency)
-                .partner(partner)
-                .completionDate(completionDate)
-                .createDate(createDate)
-                .paymentDeadline(paymentDeadline)
-                .netAmount(netAmount)
-                .grossAmount(grossAmount)
-                .vatAmount(vatAmount)
-                .income(false)                     // bejovo szamla
-                .build();
-        result.add(entity);
-
-
-        id = "E-USER-2023-12";                            // szamla sorszam
-        title = "Multivendor 2023 évre";                   // 2022-0227
-        partner = partnerService.getRandom();              // 017
-        completionDate = formatter.parse("2022-12-31");
-        createDate = formatter.parse("2023-01-06");
-        paymentDeadline = formatter.parse("2023-03-07");
-        currency = Currency.EUR;
-        netAmount = 156763.15;
-        grossAmount = netAmount * 1.27;
-        vatAmount = grossAmount - netAmount;
-        entity = Invoice.builder()
-                .id(id)
-                .title(title)
-                .currency(currency)
-                .partner(partner)
-                .completionDate(completionDate)
-                .createDate(createDate)
-                .paymentDeadline(paymentDeadline)
-                .netAmount(netAmount)
-                .grossAmount(grossAmount)
-                .vatAmount(vatAmount)
-                .income(true)                     // kimeno szamla
-                .build();
-        result.add(entity);
-
-
-        id = "E-USER-2023-13";                            // szamla sorszam
-        title = "Multivendor 2023 évre";                   // 2022-0227
-        partner = partnerService.getRandom();              // 017
-        completionDate = formatter.parse("2022-12-31");
-        createDate = formatter.parse("2023-01-06");
-        paymentDeadline = formatter.parse("2023-03-07");
-        currency = Currency.USD;
-        netAmount = 67615.27;
-        grossAmount = netAmount * 1.27;
-        vatAmount = grossAmount - netAmount;
-        entity = Invoice.builder()
-                .id(id)
-                .title(title)
-                .currency(currency)
-                .partner(partner)
-                .completionDate(completionDate)
-                .createDate(createDate)
-                .paymentDeadline(paymentDeadline)
-                .netAmount(netAmount)
-                .grossAmount(grossAmount)
-                .vatAmount(vatAmount)
-                .income(true)                     // kimeno szamla
-                .build();
-        result.add(entity);
-
-
-        id = "17356/23";                                    // szamla sorszam
-        title = "LTO8 szalagok szállítása";                   // 2023-0018
-        partner = partnerService.getRandom();              // 014
-        completionDate = formatter.parse("2023-02-06");
-        createDate = formatter.parse("2023-02-06");
-        paymentDeadline = formatter.parse("2023-03-08");
-        currency = Currency.HUF;
-        netAmount = 357500.00;
-        grossAmount = netAmount * 1.27;
-        vatAmount = grossAmount - netAmount;
-        entity = Invoice.builder()
-                .id(id)
-                .title(title)
-                .currency(currency)
-                .partner(partner)
-                .completionDate(completionDate)
-                .createDate(createDate)
-                .paymentDeadline(paymentDeadline)
-                .netAmount(netAmount)
-                .grossAmount(grossAmount)
-                .vatAmount(vatAmount)
-                .income(false)                     // bejovo szamla
-                .build();
-        result.add(entity);
-
-
-        id = "E-USER-2023-53";                             // szamla sorszam
-        title = "LTO8 szalagok szállítása";                // 2023-0018
-        partner = partnerService.getRandom();              // 015
-        completionDate = formatter.parse("2023-02-08");
-        createDate = formatter.parse("2023-02-09.");
-        paymentDeadline = formatter.parse("2023-03-08");
-        currency = Currency.HUF;
-        netAmount = 445965.00;
-        grossAmount = netAmount * 1.27;
-        vatAmount = grossAmount - netAmount;
-        entity = Invoice.builder()
-                .id(id)
-                .title(title)
-                .currency(currency)
-                .partner(partner)
-                .completionDate(completionDate)
-                .createDate(createDate)
-                .paymentDeadline(paymentDeadline)
-                .netAmount(netAmount)
-                .grossAmount(grossAmount)
-                .vatAmount(vatAmount)
-                .income(true)                     // kimeno szamla
-                .build();
-        result.add(entity);
-
-        id = "2023-SOV/000123";                                     // szamla sorszam
-        title = "PowerBuilder Professional licencek szállítása";    // 2023-0054
-        partner = partnerService.getRandom();                       // 012
-        completionDate = formatter.parse("2023-04-14");
-        createDate = formatter.parse("2023-04-17");
-        paymentDeadline = formatter.parse("2023-05-17");
-        currency = Currency.USD;
-        netAmount = 14117.00;
-        grossAmount = netAmount * 1.27;
-        vatAmount = grossAmount - netAmount;
-        entity = Invoice.builder()
-                .id(id)
-                .title(title)
-                .currency(currency)
-                .partner(partner)
-                .completionDate(completionDate)
-                .createDate(createDate)
-                .paymentDeadline(paymentDeadline)
-                .netAmount(netAmount)
-                .grossAmount(grossAmount)
-                .vatAmount(vatAmount)
-                .income(false)                     // bejovo szamla
-                .build();
-        result.add(entity);
-
-
-        id = "E-USER-2023-95";                                     // szamla sorszam
-        title = "PowerBuilder Professional licencek szállítása";    // 2023-0054
-        partner = partnerService.getRandom();                       // 016
-        completionDate = formatter.parse("2023-04-14");
-        createDate = formatter.parse("2023-04-17");
-        paymentDeadline = formatter.parse("2023-05-17");
-        currency = Currency.USD;
-        netAmount = 14497.00;
-        grossAmount = netAmount * 1.27;
-        vatAmount = grossAmount - netAmount;
-        entity = Invoice.builder()
-                .id(id)
-                .title(title)
-                .currency(currency)
-                .partner(partner)
-                .completionDate(completionDate)
-                .createDate(createDate)
-                .paymentDeadline(paymentDeadline)
-                .netAmount(netAmount)
-                .grossAmount(grossAmount)
-                .vatAmount(vatAmount)
-                .income(true)                     // kimeno szamla
-                .build();
-        result.add(entity);
+        if (income) {                                                   // csak a bejovo szamlak generalasa
+            String id = RandomStringUtils.random(8, "0123456789abcdef");
+            String humanId = "VSz-2023/00070-";                                  // szamla sorszam
+            String title = "IBM és HP diszkek szállíása régi szerverbe";    // 2022-0027
+            Partner partner = partnerService.getById("001");                   // 001
+            Date completionDate = formatter.parse("2023-02-22");
+            Date createDate = formatter.parse("2023-02-22");
+            Date paymentDeadline = formatter.parse("2023-03-24");
+            Currency currency = Currency.EUR;
+            double netAmount = 780.00;
+            double grossAmount = netAmount * 1.27;
+            double vatAmount = grossAmount - netAmount;
+            Invoice entity = Invoice.builder()
+                    .id(id)
+                    .humanId(humanId)
+                    .title(title)
+                    .currency(currency)
+                    .partner(partner)
+                    .completionDate(completionDate)
+                    .createDate(createDate)
+                    .paymentDeadline(paymentDeadline)
+                    .netAmount(netAmount)
+                    .grossAmount(grossAmount)
+                    .vatAmount(vatAmount)
+                    .income(income)                     // bejovo szamla
+                    .build();
+            result.add(entity);
+
+            id = RandomStringUtils.random(8, "0123456789abcdef");
+            humanId = "582-SPI1003006-3021";                          // szamla sorszam
+            title = "IBM Power szerver garanciakiterjesztése";   // 2020-0109
+            partner = partnerService.getById("004");               // 004
+            completionDate = formatter.parse("2020-12-22");
+            createDate = formatter.parse("2020-12-22");
+            paymentDeadline = formatter.parse("2021-02-10");
+            currency = Currency.HUF;
+            netAmount = 10665107.00;
+            grossAmount = netAmount * 1.27;
+            vatAmount = grossAmount - netAmount;
+            entity = Invoice.builder()
+                    .id(id)
+                    .humanId(humanId)
+                    .title(title)
+                    .currency(currency)
+                    .partner(partner)
+                    .completionDate(completionDate)
+                    .createDate(createDate)
+                    .paymentDeadline(paymentDeadline)
+                    .netAmount(netAmount)
+                    .grossAmount(grossAmount)
+                    .vatAmount(vatAmount)
+                    .income(income)                     // bejovo szamla
+                    .build();
+            result.add(entity);
+
+            id = RandomStringUtils.random(8, "0123456789abcdef");
+            humanId = "582-SPI003118";                                 // szamla sorszam
+            title = "IBM Power szerver garanciakiterjesztése";    // 2020-0109
+            partner = partnerService.getById("004");                 // 004
+            completionDate = formatter.parse("2020-12-31");
+            createDate = formatter.parse("2020-12-31");
+            paymentDeadline = formatter.parse("2021-03-31");
+            currency = Currency.USD;
+            netAmount = 224113.70;
+            grossAmount = netAmount * 1.27;
+            vatAmount = grossAmount - netAmount;
+            entity = Invoice.builder()
+                    .id(id)
+                    .humanId(humanId)
+                    .title(title)
+                    .currency(currency)
+                    .partner(partner)
+                    .completionDate(completionDate)
+                    .createDate(createDate)
+                    .paymentDeadline(paymentDeadline)
+                    .netAmount(netAmount)
+                    .grossAmount(grossAmount)
+                    .vatAmount(vatAmount)
+                    .income(income)                     // bejovo szamla
+                    .build();
+            result.add(entity);
+
+            id = RandomStringUtils.random(8, "0123456789abcdef");
+            humanId = "582-SPI003680";                               // szamla sorszam
+            title = "IBM Power szerver garanciakiterjesztése";  // 2020-0109
+            partner = partnerService.getById("004");               // 004
+            completionDate = formatter.parse("2021-03-08");
+            createDate = formatter.parse("2021-03-08");
+            paymentDeadline = formatter.parse("2021-04-27");
+            currency = Currency.USD;
+            netAmount = 50298.61;
+            grossAmount = netAmount * 1.27;
+            vatAmount = grossAmount - netAmount;
+            entity = Invoice.builder()
+                    .id(id)
+                    .humanId(humanId)
+                    .title(title)
+                    .currency(currency)
+                    .partner(partner)
+                    .completionDate(completionDate)
+                    .createDate(createDate)
+                    .paymentDeadline(paymentDeadline)
+                    .netAmount(netAmount)
+                    .grossAmount(grossAmount)
+                    .vatAmount(vatAmount)
+                    .income(income)                     // bejovo szamla
+                    .build();
+            result.add(entity);
+
+            id = RandomStringUtils.random(8, "0123456789abcdef");
+            humanId = "582-SPI003681";                               // szamla sorszam
+            title = "IBM Power szerver garanciakiterjesztése";  // 2020-0109
+            partner = partnerService.getById("004");               // 004
+            completionDate = formatter.parse("2021-03-08");
+            createDate = formatter.parse("2021-03-08");
+            paymentDeadline = formatter.parse("2021-04-27");
+            currency = Currency.USD;
+            netAmount = 13638.76;
+            grossAmount = netAmount * 1.27;
+            vatAmount = grossAmount - netAmount;
+            entity = Invoice.builder()
+                    .id(id)
+                    .humanId(humanId)
+                    .title(title)
+                    .currency(currency)
+                    .partner(partner)
+                    .completionDate(completionDate)
+                    .createDate(createDate)
+                    .paymentDeadline(paymentDeadline)
+                    .netAmount(netAmount)
+                    .grossAmount(grossAmount)
+                    .vatAmount(vatAmount)
+                    .income(income)                     // bejovo szamla
+                    .build();
+            result.add(entity);
+
+            id = RandomStringUtils.random(8, "0123456789abcdef");
+            humanId = "582-SPI004090";                               // szamla sorszam
+            title = "IBM Power szerver garanciakiterjesztése";  // 2020-0109
+            partner = partnerService.getById("004");               // 004
+            completionDate = formatter.parse("2021-04-19");
+            createDate = formatter.parse("2021-04-19");
+            paymentDeadline = formatter.parse("2021-06-08");
+            currency = Currency.USD;
+            netAmount = 1017.61;
+            grossAmount = netAmount * 1.27;
+            vatAmount = grossAmount - netAmount;
+            entity = Invoice.builder()
+                    .id(id)
+                    .humanId(humanId)
+                    .title(title)
+                    .currency(currency)
+                    .partner(partner)
+                    .completionDate(completionDate)
+                    .createDate(createDate)
+                    .paymentDeadline(paymentDeadline)
+                    .netAmount(netAmount)
+                    .grossAmount(grossAmount)
+                    .vatAmount(vatAmount)
+                    .income(income)                     // bejovo szamla
+                    .build();
+            result.add(entity);
+
+            id = RandomStringUtils.random(8, "0123456789abcdef");
+            humanId = "9090010764";                                  // szamla sorszam
+            title = "IBM Power szerver garanciakiterjesztése";  // 2020-0109
+            partner = partnerService.getById("005");               // 005
+            completionDate = formatter.parse("2020-12-31");
+            createDate = formatter.parse("2020-12-31");
+            paymentDeadline = formatter.parse("2021-03-01");
+            currency = Currency.HUF;
+            netAmount = 2054165.00;
+            grossAmount = netAmount * 1.27;
+            vatAmount = grossAmount - netAmount;
+            entity = Invoice.builder()
+                    .id(id)
+                    .humanId(humanId)
+                    .title(title)
+                    .currency(currency)
+                    .partner(partner)
+                    .completionDate(completionDate)
+                    .createDate(createDate)
+                    .paymentDeadline(paymentDeadline)
+                    .netAmount(netAmount)
+                    .grossAmount(grossAmount)
+                    .vatAmount(vatAmount)
+                    .income(income)                     // bejovo szamla
+                    .build();
+            result.add(entity);
+
+            id = RandomStringUtils.random(8, "0123456789abcdef");
+            humanId = "VSz-2021/00091";                                  // szamla sorszam
+            title = "IBM Power szerver garanciakiterjesztése";      // 2020-0109
+            partner = partnerService.getById("006");                   // 006
+            completionDate = formatter.parse("2021-02-10");
+            createDate = formatter.parse("2021-02-18");
+            paymentDeadline = formatter.parse("2021-03-20");
+            currency = Currency.HUF;
+            netAmount = 6142818.00;
+            grossAmount = netAmount * 1.27;
+            vatAmount = grossAmount - netAmount;
+            entity = Invoice.builder()
+                    .id(id)
+                    .humanId(humanId)
+                    .title(title)
+                    .currency(currency)
+                    .partner(partner)
+                    .completionDate(completionDate)
+                    .createDate(createDate)
+                    .paymentDeadline(paymentDeadline)
+                    .netAmount(netAmount)
+                    .grossAmount(grossAmount)
+                    .vatAmount(vatAmount)
+                    .income(income)                     // bejovo szamla
+                    .build();
+            result.add(entity);
+
+            id = RandomStringUtils.random(8, "0123456789abcdef");
+            humanId = "EURSZLA0177/2022";                           // szamla sorszam
+            title = "Multivendor 2023 évre";                   // 2022-0227
+            partner = partnerService.getById("008");              // 008
+            completionDate = formatter.parse("2022-12-30");
+            createDate = formatter.parse("2022-12-30");
+            paymentDeadline = formatter.parse("2023-01-31");
+            currency = Currency.EUR;
+            netAmount = 2375.10;
+            grossAmount = netAmount * 1.27;
+            vatAmount = grossAmount - netAmount;
+            entity = Invoice.builder()
+                    .id(id)
+                    .humanId(humanId)
+                    .title(title)
+                    .currency(currency)
+                    .partner(partner)
+                    .completionDate(completionDate)
+                    .createDate(createDate)
+                    .paymentDeadline(paymentDeadline)
+                    .netAmount(netAmount)
+                    .grossAmount(grossAmount)
+                    .vatAmount(vatAmount)
+                    .income(income)                     // bejovo szamla
+                    .build();
+            result.add(entity);
+
+            id = RandomStringUtils.random(8, "0123456789abcdef");
+            humanId = "19044";                                       // szamla sorszam
+            title = "Multivendor 2023 évre";                   // 2022-0227
+            partner = partnerService.getById("009");              // 009
+            completionDate = formatter.parse("2022-12-22");
+            createDate = formatter.parse("2022-12-22");
+            paymentDeadline = formatter.parse("2023-01-26");
+            currency = Currency.EUR;
+            netAmount = 390.00;
+            grossAmount = netAmount * 1.27;             // Ez a számla ÁFA-mentes !!!!
+            vatAmount = grossAmount - netAmount;
+            entity = Invoice.builder()
+                    .id(id)
+                    .humanId(humanId)
+                    .title(title)
+                    .currency(currency)
+                    .partner(partner)
+                    .completionDate(completionDate)
+                    .createDate(createDate)
+                    .paymentDeadline(paymentDeadline)
+                    .netAmount(netAmount)
+                    .grossAmount(grossAmount)
+                    .vatAmount(vatAmount)
+                    .income(income)                     // bejovo szamla
+                    .build();
+            result.add(entity);
+
+            id = RandomStringUtils.random(8, "0123456789abcdef");
+            humanId = "9171058452";                                       // szamla sorszam
+            title = "Multivendor 2023 évre";                   // 2022-0227
+            partner = partnerService.getById("010");              // 010
+            completionDate = formatter.parse("2022-12-30");
+            createDate = formatter.parse("2023-01-13");
+            paymentDeadline = formatter.parse("2023-02-12");
+            currency = Currency.USD;
+            netAmount = 22490.00;
+            grossAmount = netAmount * 1.27;
+            vatAmount = grossAmount - netAmount;
+            entity = Invoice.builder()
+                    .id(id)
+                    .humanId(humanId)
+                    .title(title)
+                    .currency(currency)
+                    .partner(partner)
+                    .completionDate(completionDate)
+                    .createDate(createDate)
+                    .paymentDeadline(paymentDeadline)
+                    .netAmount(netAmount)
+                    .grossAmount(grossAmount)
+                    .vatAmount(vatAmount)
+                    .income(income)                     // bejovo szamla
+                    .build();
+            result.add(entity);
+
+            id = RandomStringUtils.random(8, "0123456789abcdef");
+            humanId = "9171058628";                                       // szamla sorszam
+            title = "Multivendor 2023 évre";                   // 2022-0227
+            partner = partnerService.getById("010");              // 010
+            completionDate = formatter.parse("2023-01-12");
+            createDate = formatter.parse("2023-01-19");
+            paymentDeadline = formatter.parse("2023-02-18");
+            currency = Currency.USD;
+            netAmount = 30.00;
+            grossAmount = netAmount * 1.27;
+            vatAmount = grossAmount - netAmount;
+            entity = Invoice.builder()
+                    .id(id)
+                    .humanId(humanId)
+                    .title(title)
+                    .currency(currency)
+                    .partner(partner)
+                    .completionDate(completionDate)
+                    .createDate(createDate)
+                    .paymentDeadline(paymentDeadline)
+                    .netAmount(netAmount)
+                    .grossAmount(grossAmount)
+                    .vatAmount(vatAmount)
+                    .income(income)                     // bejovo szamla
+                    .build();
+            result.add(entity);
+
+            id = RandomStringUtils.random(8, "0123456789abcdef");
+            humanId = "9171058628";                                       // szamla sorszam
+            title = "Multivendor 2023 évre";                   // 2022-0227
+            partner = partnerService.getById("011");              // 011
+            completionDate = formatter.parse("2022-12-23");
+            createDate = formatter.parse("2022-12-23");
+            paymentDeadline = formatter.parse("2023-01-07");
+            currency = Currency.EUR;
+            netAmount = 9500.00;
+            grossAmount = netAmount * 1.27;
+            vatAmount = grossAmount - netAmount;
+            entity = Invoice.builder()
+                    .id(id)
+                    .humanId(humanId)
+                    .title(title)
+                    .currency(currency)
+                    .partner(partner)
+                    .completionDate(completionDate)
+                    .createDate(createDate)
+                    .paymentDeadline(paymentDeadline)
+                    .netAmount(netAmount)
+                    .grossAmount(grossAmount)
+                    .vatAmount(vatAmount)
+                    .income(income)                     // bejovo szamla
+                    .build();
+            result.add(entity);
+
+            id = RandomStringUtils.random(8, "0123456789abcdef");
+            humanId = "2022-SOV/000495";                                       // szamla sorszam
+            title = "Multivendor 2023 évre";                   // 2022-0227
+            partner = partnerService.getById("012");              // 012
+            completionDate = formatter.parse("2022-12-31");
+            createDate = formatter.parse("2022-12-31");
+            paymentDeadline = formatter.parse("2023-01-30");
+            currency = Currency.EUR;
+            netAmount = 44490.03;
+            grossAmount = netAmount * 1.27;
+            vatAmount = grossAmount - netAmount;
+            entity = Invoice.builder()
+                    .id(id)
+                    .humanId(humanId)
+                    .title(title)
+                    .currency(currency)
+                    .partner(partner)
+                    .completionDate(completionDate)
+                    .createDate(createDate)
+                    .paymentDeadline(paymentDeadline)
+                    .netAmount(netAmount)
+                    .grossAmount(grossAmount)
+                    .vatAmount(vatAmount)
+                    .income(income)                     // bejovo szamla
+                    .build();
+            result.add(entity);
+
+            id = RandomStringUtils.random(8, "0123456789abcdef");
+            humanId = "2022-SOV/000496";                            // szamla sorszam
+            title = "Multivendor 2023 évre";                   // 2022-0227
+            partner = partnerService.getById("012");              // 012
+            completionDate = formatter.parse("2022-12-31");
+            createDate = formatter.parse("2022-12-31");
+            paymentDeadline = formatter.parse("2023-01-30");
+            currency = Currency.USD;
+            netAmount = 21657.29;
+            grossAmount = netAmount * 1.27;
+            vatAmount = grossAmount - netAmount;
+            entity = Invoice.builder()
+                    .id(id)
+                    .humanId(humanId)
+                    .title(title)
+                    .currency(currency)
+                    .partner(partner)
+                    .completionDate(completionDate)
+                    .createDate(createDate)
+                    .paymentDeadline(paymentDeadline)
+                    .netAmount(netAmount)
+                    .grossAmount(grossAmount)
+                    .vatAmount(vatAmount)
+                    .income(income)                     // bejovo szamla
+                    .build();
+            result.add(entity);
+
+            id = RandomStringUtils.random(8, "0123456789abcdef");
+            humanId = "E-SYMPR-2022-105";                            // szamla sorszam
+            title = "Multivendor 2023 évre";                   // 2022-0227
+            partner = partnerService.getById("013");              // 013
+            completionDate = formatter.parse("2022-12-28");
+            createDate = formatter.parse("2022-12-28");
+            paymentDeadline = formatter.parse("2023-01-27");
+            currency = Currency.EUR;
+            netAmount = 52508.92;
+            grossAmount = netAmount * 1.27;
+            vatAmount = grossAmount - netAmount;
+            entity = Invoice.builder()
+                    .id(id)
+                    .humanId(humanId)
+                    .title(title)
+                    .currency(currency)
+                    .partner(partner)
+                    .completionDate(completionDate)
+                    .createDate(createDate)
+                    .paymentDeadline(paymentDeadline)
+                    .netAmount(netAmount)
+                    .grossAmount(grossAmount)
+                    .vatAmount(vatAmount)
+                    .income(income)                     // bejovo szamla
+                    .build();
+            result.add(entity);
+
+            id = RandomStringUtils.random(8, "0123456789abcdef");
+            humanId = "17356/23";                                    // szamla sorszam
+            title = "LTO8 szalagok szállítása";                   // 2023-0018
+            partner = partnerService.getById("014");              // 014
+            completionDate = formatter.parse("2023-02-06");
+            createDate = formatter.parse("2023-02-06");
+            paymentDeadline = formatter.parse("2023-03-08");
+            currency = Currency.HUF;
+            netAmount = 357500.00;
+            grossAmount = netAmount * 1.27;
+            vatAmount = grossAmount - netAmount;
+            entity = Invoice.builder()
+                    .id(id)
+                    .humanId(humanId)
+                    .title(title)
+                    .currency(currency)
+                    .partner(partner)
+                    .completionDate(completionDate)
+                    .createDate(createDate)
+                    .paymentDeadline(paymentDeadline)
+                    .netAmount(netAmount)
+                    .grossAmount(grossAmount)
+                    .vatAmount(vatAmount)
+                    .income(income)                     // bejovo szamla
+                    .build();
+            result.add(entity);
+
+            id = RandomStringUtils.random(8, "0123456789abcdef");
+            humanId = "2023-SOV/000123";                                     // szamla sorszam
+            title = "PowerBuilder Professional licencek szállítása";    // 2023-0054
+            partner = partnerService.getById("012");                       // 012
+            completionDate = formatter.parse("2023-04-14");
+            createDate = formatter.parse("2023-04-17");
+            paymentDeadline = formatter.parse("2023-05-17");
+            currency = Currency.USD;
+            netAmount = 14117.00;
+            grossAmount = netAmount * 1.27;
+            vatAmount = grossAmount - netAmount;
+            entity = Invoice.builder()
+                    .id(id)
+                    .humanId(humanId)
+                    .title(title)
+                    .currency(currency)
+                    .partner(partner)
+                    .completionDate(completionDate)
+                    .createDate(createDate)
+                    .paymentDeadline(paymentDeadline)
+                    .netAmount(netAmount)
+                    .grossAmount(grossAmount)
+                    .vatAmount(vatAmount)
+                    .income(income)                     // bejovo szamla
+                    .build();
+            result.add(entity);
+
+
+            String id = RandomStringUtils.random(8, "0123456789abcdef");
+            String humanId = "USER-2023-7";                                    // szamla sorszam
+            String title = "IBM és HP diszkek szállíása régi szerverbe";  // 2022-0027
+            Partner partner = partnerService.getById("002");                  // 002
+            Date completionDate = formatter.parse("2023-02-23");
+            Date createDate = formatter.parse("2023-02-23");
+            Date paymentDeadline = formatter.parse("2023-03-25");
+            Currency currency = Currency.HUF;
+            double netAmount = 338910.00;
+            double grossAmount = netAmount * 1.27;
+            double vatAmount = grossAmount - netAmount;
+            Invoice entity = Invoice.builder()
+                    .id(id)
+                    .humanId(humanId)
+                    .title(title)
+                    .currency(currency)
+                    .partner(partner)
+                    .completionDate(completionDate)
+                    .createDate(createDate)
+                    .paymentDeadline(paymentDeadline)
+                    .netAmount(netAmount)
+                    .grossAmount(grossAmount)
+                    .vatAmount(vatAmount)
+                    .income(income)                     // kimeno szamla
+                    .build();
+            result.add(entity);
+
+            id = RandomStringUtils.random(8, "0123456789abcdef");
+            humanId = "2021/0001";                                  // szamla sorszam
+            title = "IBM Power szerver garanciakiterjesztése";      // 2020-0109
+            partner = partnerService.getById("007");                   // 007
+            completionDate = formatter.parse("2020-12-31");
+            createDate = formatter.parse("2021-01-04");
+            paymentDeadline = formatter.parse("2021-04-04");
+            currency = Currency.HUF;
+            netAmount = 81000000.00;
+            grossAmount = netAmount * 1.27;
+            vatAmount = grossAmount - netAmount;
+            entity = Invoice.builder()
+                    .id(id)
+                    .humanId(humanId)
+                    .title(title)
+                    .currency(currency)
+                    .partner(partner)
+                    .completionDate(completionDate)
+                    .createDate(createDate)
+                    .paymentDeadline(paymentDeadline)
+                    .netAmount(netAmount)
+                    .grossAmount(grossAmount)
+                    .vatAmount(vatAmount)
+                    .income(income)                     // kimeno szamla
+                    .build();
+            result.add(entity);
+
+        } else {                                                // csak a kimeno szamlak generalasa
+            id = RandomStringUtils.random(8, "0123456789abcdef");
+            humanId = "2021/0069";                                  // szamla sorszam
+            title = "IBM Power szerver garanciakiterjesztése";      // 2020-0109
+            partner = partnerService.getById("007");                   // 007
+            completionDate = formatter.parse("2021-03-09");
+            createDate = formatter.parse("2021-03-10");
+            paymentDeadline = formatter.parse("2021-06-08.");
+            currency = Currency.HUF;
+            netAmount = 47636271.00;
+            grossAmount = netAmount * 1.27;
+            vatAmount = grossAmount - netAmount;
+            entity = Invoice.builder()
+                    .id(id)
+                    .humanId(humanId)
+                    .title(title)
+                    .currency(currency)
+                    .partner(partner)
+                    .completionDate(completionDate)
+                    .createDate(createDate)
+                    .paymentDeadline(paymentDeadline)
+                    .netAmount(netAmount)
+                    .grossAmount(grossAmount)
+                    .vatAmount(vatAmount)
+                    .income(income)                     // kimeno szamla
+                    .build();
+            result.add(entity);
+
+            id = RandomStringUtils.random(8, "0123456789abcdef");
+            humanId = "E-USER-2023-12";                            // szamla sorszam
+            title = "Multivendor 2023 évre";                   // 2022-0227
+            partner = partnerService.getById("017");              // 017
+            completionDate = formatter.parse("2022-12-31");
+            createDate = formatter.parse("2023-01-06");
+            paymentDeadline = formatter.parse("2023-03-07");
+            currency = Currency.EUR;
+            netAmount = 156763.15;
+            grossAmount = netAmount * 1.27;
+            vatAmount = grossAmount - netAmount;
+            entity = Invoice.builder()
+                    .id(id)
+                    .humanId(humanId)
+                    .title(title)
+                    .currency(currency)
+                    .partner(partner)
+                    .completionDate(completionDate)
+                    .createDate(createDate)
+                    .paymentDeadline(paymentDeadline)
+                    .netAmount(netAmount)
+                    .grossAmount(grossAmount)
+                    .vatAmount(vatAmount)
+                    .income(income)                     // kimeno szamla
+                    .build();
+            result.add(entity);
+
+
+            id = RandomStringUtils.random(8, "0123456789abcdef");
+            humanId = "E-USER-2023-13";                            // szamla sorszam
+            title = "Multivendor 2023 évre";                   // 2022-0227
+            partner = partnerService.getById("017");              // 017
+            completionDate = formatter.parse("2022-12-31");
+            createDate = formatter.parse("2023-01-06");
+            paymentDeadline = formatter.parse("2023-03-07");
+            currency = Currency.USD;
+            netAmount = 67615.27;
+            grossAmount = netAmount * 1.27;
+            vatAmount = grossAmount - netAmount;
+            entity = Invoice.builder()
+                    .id(id)
+                    .humanId(humanId)
+                    .title(title)
+                    .currency(currency)
+                    .partner(partner)
+                    .completionDate(completionDate)
+                    .createDate(createDate)
+                    .paymentDeadline(paymentDeadline)
+                    .netAmount(netAmount)
+                    .grossAmount(grossAmount)
+                    .vatAmount(vatAmount)
+                    .income(income)                     // kimeno szamla
+                    .build();
+            result.add(entity);
+
+            id = RandomStringUtils.random(8, "0123456789abcdef");
+            humanId = "E-USER-2023-53";                             // szamla sorszam
+            title = "LTO8 szalagok szállítása";                // 2023-0018
+            partner = partnerService.getById("015");              // 015
+            completionDate = formatter.parse("2023-02-08");
+            createDate = formatter.parse("2023-02-09.");
+            paymentDeadline = formatter.parse("2023-03-08");
+            currency = Currency.HUF;
+            netAmount = 445965.00;
+            grossAmount = netAmount * 1.27;
+            vatAmount = grossAmount - netAmount;
+            entity = Invoice.builder()
+                    .id(id)
+                    .humanId(humanId)
+                    .title(title)
+                    .currency(currency)
+                    .partner(partner)
+                    .completionDate(completionDate)
+                    .createDate(createDate)
+                    .paymentDeadline(paymentDeadline)
+                    .netAmount(netAmount)
+                    .grossAmount(grossAmount)
+                    .vatAmount(vatAmount)
+                    .income(income)                     // kimeno szamla
+                    .build();
+            result.add(entity);
+
+            id = RandomStringUtils.random(8, "0123456789abcdef");
+            humanId = "E-USER-2023-95";                                     // szamla sorszam
+            title = "PowerBuilder Professional licencek szállítása";    // 2023-0054
+            partner = partnerService.getById("016");                       // 016
+            completionDate = formatter.parse("2023-04-14");
+            createDate = formatter.parse("2023-04-17");
+            paymentDeadline = formatter.parse("2023-05-17");
+            currency = Currency.USD;
+            netAmount = 14497.00;
+            grossAmount = netAmount * 1.27;
+            vatAmount = grossAmount - netAmount;
+            entity = Invoice.builder()
+                    .id(id)
+                    .humanId(humanId)
+                    .title(title)
+                    .currency(currency)
+                    .partner(partner)
+                    .completionDate(completionDate)
+                    .createDate(createDate)
+                    .paymentDeadline(paymentDeadline)
+                    .netAmount(netAmount)
+                    .grossAmount(grossAmount)
+                    .vatAmount(vatAmount)
+                    .income(income)                     // kimeno szamla
+                    .build();
+            result.add(entity);
+        }
 
         return result;
     }
 
+    @Override
+    public Invoice getById(String id) {
+        return getAll().stream().filter(p -> p.getId().equals(id)).findFirst().get();
+    }
+
+    @Override
+    public Invoice getByHumanId(String id) {
+        return getAll().stream().filter(p -> p.getHumanId().equals(id)).findFirst().get();
+    }
+
+    @Override
+    public List<Invoice> getByHumanIds(String[] ids) {
+        List<Invoice> result = new ArrayList<>();
+
+        for (String i : ids) {
+            result.add(getByHumanId(i));
+        }
+
+        return result;
+    }
+
+
+
     @Override
     public List<Invoice> getRandom(boolean income) {
         getAll();

diff --git a/lis-services/src/main/java/hu/user/lis/services/data/PartnerService.java b/lis-services/src/main/java/hu/user/lis/services/data/PartnerService.java
index 84301235b0864b2bb70cd1f43a97afa55eabe8e4..c2ee70fb94a9a3ec2d7db4404f01c1fa70198d91 100644 (file)
--- a/lis-services/src/main/java/hu/user/lis/services/data/PartnerService.java
+++ b/lis-services/src/main/java/hu/user/lis/services/data/PartnerService.java
@@ -20,6 +20,8 @@ public interface PartnerService {
 
     Partner getRandom();
 
+    Partner getById(String id);
+
     String toString(Partner sourceEntity) throws JsonProcessingException;
 
     Partner copy(Partner sourceEntity, String property, Object value) throws JsonProcessingException, NoSuchFieldException, IllegalAccessException;

diff --git a/lis-services/src/main/java/hu/user/lis/services/data/PartnerServiceImpl.java b/lis-services/src/main/java/hu/user/lis/services/data/PartnerServiceImpl.java
index b30d22403c618c6b94560b2f2aaa7af7606c5c9f..14df532547223d22080c122b997bfaaffee503dc 100644 (file)
--- a/lis-services/src/main/java/hu/user/lis/services/data/PartnerServiceImpl.java
+++ b/lis-services/src/main/java/hu/user/lis/services/data/PartnerServiceImpl.java
@@ -1,5 +1,6 @@
 package hu.user.lis.services.data;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.javafaker.Address;
 import hu.user.lis.db.Partner;
@@ -9,6 +10,7 @@ import org.apache.commons.lang3.RandomUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -24,7 +26,7 @@ public class PartnerServiceImpl extends DataServiceImpl<Partner> implements Part
     @Override
     public List<Partner> getAll() {
         if (entities == null) {
-            entities = generate();
+            entities = generate2();
         }
         return entities;
     }
@@ -78,7 +80,6 @@ public class PartnerServiceImpl extends DataServiceImpl<Partner> implements Part
 
     private List<Partner> generate2() {
         List<Partner> result = new ArrayList<>();
-        int count = RandomUtils.nextInt(5, 10);
 
         String id = "001";
         String name = "ServerUnite Kft.";
@@ -131,7 +132,7 @@ public class PartnerServiceImpl extends DataServiceImpl<Partner> implements Part
         id = "009";
         name = "JamoDat";
         vatNr = RandomStringUtils.random(12, "0123456789");
-        partner = Partner.builder().active(true).id(id).name(name).vatNr(vatNr).address("4700 Næstved, Saltø Skovvænge 36, Denmark").build();
+        partner = Partner.builder().active(true).id(id).name(name).vatNr(vatNr).address("4700 Naestved, Salto Skovvange 36, Denmark").build();
         result.add(partner);
 
         id = "010";
@@ -185,4 +186,41 @@ public class PartnerServiceImpl extends DataServiceImpl<Partner> implements Part
         return result;
     }
 
+    @Override
+    public Partner copy(Partner sourceEntity) {
+        Partner result = null;
+        try {
+            String json = toString(sourceEntity);
+            result = mapper.readValue(json, Partner.class);
+        } catch (JsonProcessingException e) {
+            log.catching(e);
+        }
+        return result;
+    }
+
+    @Override
+    public String toString(Partner sourceEntity) {
+        String result = null;
+        try {
+            result = mapper.writeValueAsString(sourceEntity);
+        } catch (JsonProcessingException e) {
+            log.catching(e);
+        }
+        return result;
+    }
+
+    @Override
+    public Partner copy(Partner sourceEntity, String property, Object value) {
+        Partner result = copy(sourceEntity);
+        Field field = null;
+        try {
+            field = result.getClass().getDeclaredField(property);
+            field.setAccessible(true);
+            field.set(result, value);
+        } catch (Exception e) {
+            log.catching(e);
+        }
+        return result;
+    }
+
 }

diff --git a/lis-services/src/main/java/hu/user/lis/services/data/ProjectService.java b/lis-services/src/main/java/hu/user/lis/services/data/ProjectService.java
index b1f1a7dbc842c89cc3ba9f5368dd967c305a792f..912afb79962fbe5821e249bc9b1134c134032276 100644 (file)
--- a/lis-services/src/main/java/hu/user/lis/services/data/ProjectService.java
+++ b/lis-services/src/main/java/hu/user/lis/services/data/ProjectService.java
@@ -1,5 +1,6 @@
 package hu.user.lis.services.data;
 
+import hu.user.lis.db.Partner;
 import hu.user.lis.db.Project;
 
 import java.util.List;
@@ -7,6 +8,10 @@ import java.util.List;
 public interface ProjectService {
     List<Project> getAll();
 
+    Project getById(String id);
+
+    List<Project> getByPartner(String id);
+
     Project createNew();
 
     void add(Project entity);

diff --git a/lis-services/src/main/java/hu/user/lis/services/data/ProjectServiceImpl.java b/lis-services/src/main/java/hu/user/lis/services/data/ProjectServiceImpl.java
index 1212e6a49eeb5a3f3a0fb8aa61891bb7f5307643..49e337a1d684c8e4462bc3e43a45235783d73001 100644 (file)
--- a/lis-services/src/main/java/hu/user/lis/services/data/ProjectServiceImpl.java
+++ b/lis-services/src/main/java/hu/user/lis/services/data/ProjectServiceImpl.java
@@ -13,6 +13,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 @Service
 @Log4j2
@@ -30,11 +31,22 @@ public class ProjectServiceImpl extends DataServiceImpl<Project> implements Proj
     @Override
     public List<Project> getAll() {
         if (entities == null) {
-            entities = generate();
+            entities = generate2();
         }
         return entities;
     }
 
+    @Override
+    public Project getById(String id) {
+        return getAll().stream().filter(p -> p.getId().equals(id)).findFirst().get();
+    }
+
+    @Override
+    public List<Project> getByPartner(String id) {
+        return getAll().stream().filter(p -> p.getPartner().getId().equals(id)).collect(Collectors.toList());
+    }
+
+
     @Override
     public Project createNew() {
         String id = RandomStringUtils.random(8, "0123456789abcdef");
@@ -90,11 +102,11 @@ public class ProjectServiceImpl extends DataServiceImpl<Project> implements Proj
     private List<Project> generate2() {
         List<Project> result = new ArrayList<>();
 
-        String id = "2022-0027";
+        String id = dataGeneratorService.faker().code().isbn10(true);
         String name = "IBM és HP diszkek szállítása régi szerverbe";
-        String humanId = dataGeneratorService.faker().code().isbn10(true);
+        String humanId = "2022-0027";
         String contactName = dataGeneratorService.faker().name().fullName();
-        Partner partner = partnerService.getRandom();               // 002
+        Partner partner = partnerService.getById("002");               // 002
         Project entity = Project.builder()
                 .id(id)
                 .active(true)
@@ -102,16 +114,16 @@ public class ProjectServiceImpl extends DataServiceImpl<Project> implements Proj
                 .name(name)
                 .contactName(contactName)
                 .partner(partner)
-                .incomingInvoices(invoiceService.getRandom(true))   // VSz-2023/00070-
-                .outgoingInvoices(invoiceService.getRandom(false))  // USER-2023-7
+                .incomingInvoices(invoiceService.getByHumanIds(new String[] {"VSz-2023/00070-"}))   // VSz-2023/00070-
+                .outgoingInvoices(invoiceService.getByHumanIds(new String[] {"USER-2023-7"}))  // USER-2023-7
                 .build();
         result.add(entity);
 
-        id = "2022-0109";
+        id = dataGeneratorService.faker().code().isbn10(true);
         name = "IBM Power szerver garanciakiterjesztése";
-        humanId = dataGeneratorService.faker().code().isbn10(true);
+        humanId = "2022-0109";
         contactName = dataGeneratorService.faker().name().fullName();
-        partner = partnerService.getRandom();                       // 007
+        partner = partnerService.getById("007");                       // 007
         entity = Project.builder()
                 .id(id)
                 .active(true)
@@ -119,16 +131,16 @@ public class ProjectServiceImpl extends DataServiceImpl<Project> implements Proj
                 .name(name)
                 .contactName(contactName)
                 .partner(partner)
-                .incomingInvoices(invoiceService.getRandom(true))   // 582-SPI1003006-3021, 582-SPI003118, 582-SPI003680, 582-SPI003681, 582-SPI004090, 9090010764, VSz-2021/00091
-                .outgoingInvoices(invoiceService.getRandom(false))  // 2021/0001, 2021/0069
+                .incomingInvoices(invoiceService.getByHumanIds(new String[]{"582-SPI1003006-3021","582-SPI003118","582-SPI003680","582-SPI003681","582-SPI004090","9090010764","VSz-2021/00091"}))   // 582-SPI1003006-3021, 582-SPI003118, 582-SPI003680, 582-SPI003681, 582-SPI004090, 9090010764, VSz-2021/00091
+                .outgoingInvoices(invoiceService.getByHumanIds(new String[]{"2021/0001","2021/0069"}))  // 2021/0001, 2021/0069
                 .build();
         result.add(entity);
 
-        id = "2022-0227";
+        id = dataGeneratorService.faker().code().isbn10(true);
         name = "Multivendor 2023 évre";
-        humanId = dataGeneratorService.faker().code().isbn10(true);
+        humanId = "2022-0227";
         contactName = dataGeneratorService.faker().name().fullName();
-        partner = partnerService.getRandom();                       // 017
+        partner = partnerService.getById("017");                       // 017
         entity = Project.builder()
                 .id(id)
                 .active(true)
@@ -136,16 +148,16 @@ public class ProjectServiceImpl extends DataServiceImpl<Project> implements Proj
                 .name(name)
                 .contactName(contactName)
                 .partner(partner)
-                .incomingInvoices(invoiceService.getRandom(true))   // EURSZLA0177/2022, 19044, 9171058452, 9171058628, V-SZ3-2022/00001, 2022-SOV/000495, 2022-SOV/000496, E-SYMPR-2022-105
-                .outgoingInvoices(invoiceService.getRandom(false))  // E-USER-2023-12, E-USER-2023-13
+                .incomingInvoices(invoiceService.getByHumanIds(new String[]{"EURSZLA0177/2022","19044","9171058452","9171058628","2022-SOV/000495","2022-SOV/000496","E-SYMPR-2022-105"}))   // EURSZLA0177/2022, 19044, 9171058452, 9171058628, V-SZ3-2022/00001, 2022-SOV/000495, 2022-SOV/000496, E-SYMPR-2022-105
+                .outgoingInvoices(invoiceService.getByHumanIds(new String[]{"E-USER-2023-12","E-USER-2023-13"}))  // E-USER-2023-12, E-USER-2023-13
                 .build();
         result.add(entity);
 
-        id = "2023-0018";
+        id = dataGeneratorService.faker().code().isbn10(true);
         name = "LTO8 szalagok szállítása";
-        humanId = dataGeneratorService.faker().code().isbn10(true);
+        humanId = "2023-0018";
         contactName = dataGeneratorService.faker().name().fullName();
-        partner = partnerService.getRandom();                       // 015
+        partner = partnerService.getById("015");                       // 015
         entity = Project.builder()
                 .id(id)
                 .active(true)
@@ -153,16 +165,16 @@ public class ProjectServiceImpl extends DataServiceImpl<Project> implements Proj
                 .name(name)
                 .contactName(contactName)
                 .partner(partner)
-                .incomingInvoices(invoiceService.getRandom(true))   // 17356/23
-                .outgoingInvoices(invoiceService.getRandom(false))  // E-USER-2023-53
+                .incomingInvoices(invoiceService.getByHumanIds(new String[]{"17356/23"}))   // 17356/23
+                .outgoingInvoices(invoiceService.getByHumanIds(new String[]{"E-USER-2023-53"}))  // E-USER-2023-53
                 .build();
         result.add(entity);
 
-        id = "2023-0054";
+        id = dataGeneratorService.faker().code().isbn10(true);
         name = "PowerBuilder Professional licencek szállítása";
-        humanId = dataGeneratorService.faker().code().isbn10(true);
+        humanId = "2023-0054";
         contactName = dataGeneratorService.faker().name().fullName();
-        partner = partnerService.getRandom();                       // 016
+        partner = partnerService.getById("016");                       // 016
         entity = Project.builder()
                 .id(id)
                 .active(true)
@@ -170,8 +182,8 @@ public class ProjectServiceImpl extends DataServiceImpl<Project> implements Proj
                 .name(name)
                 .contactName(contactName)
                 .partner(partner)
-                .incomingInvoices(invoiceService.getRandom(true))   // 2023-SOV/000123
-                .outgoingInvoices(invoiceService.getRandom(false))  // E-USER-2023-95
+                .incomingInvoices(invoiceService.getByHumanIds(new String[]{"2023-SOV/000123"}))   // 2023-SOV/000123
+                .outgoingInvoices(invoiceService.getByHumanIds(new String[]{"E-USER-2023-95"}))  // E-USER-2023-95
                 .build();
         result.add(entity);