Merge conflict resolved

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 f77d8aad45f121c365113fb48d82b5cc6216daaa..48f2ceea0c6bc460c3482a6cae6cbbf3a43122b5 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
@@ -117,7 +117,7 @@ public class InvoiceServiceImpl extends DataServiceImpl<Invoice> implements Invo
         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
+            String title = dataGeneratorService.faker().commerce().productName();    // 2022-0027
             Partner partner = partnerService.getById("001");                   // 001
             Date completionDate = formatter.parse("2023-02-22");
             Date createDate = formatter.parse("2023-02-22");
@@ -144,7 +144,7 @@ public class InvoiceServiceImpl extends DataServiceImpl<Invoice> implements Invo
 
             id = RandomStringUtils.random(8, "0123456789abcdef");
             humanId = "582-SPI1003006-3021";                          // szamla sorszam
-            title = "IBM Power szerver garanciakiterjesztése";   // 2020-0109
+            title = dataGeneratorService.faker().commerce().productName();   // 2020-0109
             partner = partnerService.getById("004");               // 004
             completionDate = formatter.parse("2020-12-22");
             createDate = formatter.parse("2020-12-22");
@@ -171,7 +171,7 @@ public class InvoiceServiceImpl extends DataServiceImpl<Invoice> implements Invo
 
             id = RandomStringUtils.random(8, "0123456789abcdef");
             humanId = "582-SPI003118";                                 // szamla sorszam
-            title = "IBM Power szerver garanciakiterjesztése";    // 2020-0109
+            title = dataGeneratorService.faker().commerce().productName();    // 2020-0109
             partner = partnerService.getById("004");                 // 004
             completionDate = formatter.parse("2020-12-31");
             createDate = formatter.parse("2020-12-31");
@@ -198,7 +198,7 @@ public class InvoiceServiceImpl extends DataServiceImpl<Invoice> implements Invo
 
             id = RandomStringUtils.random(8, "0123456789abcdef");
             humanId = "582-SPI003680";                               // szamla sorszam
-            title = "IBM Power szerver garanciakiterjesztése";  // 2020-0109
+            title = dataGeneratorService.faker().commerce().productName();  // 2020-0109
             partner = partnerService.getById("004");               // 004
             completionDate = formatter.parse("2021-03-08");
             createDate = formatter.parse("2021-03-08");
@@ -225,7 +225,7 @@ public class InvoiceServiceImpl extends DataServiceImpl<Invoice> implements Invo
 
             id = RandomStringUtils.random(8, "0123456789abcdef");
             humanId = "582-SPI003681";                               // szamla sorszam
-            title = "IBM Power szerver garanciakiterjesztése";  // 2020-0109
+            title = dataGeneratorService.faker().commerce().productName();  // 2020-0109
             partner = partnerService.getById("004");               // 004
             completionDate = formatter.parse("2021-03-08");
             createDate = formatter.parse("2021-03-08");
@@ -252,7 +252,7 @@ public class InvoiceServiceImpl extends DataServiceImpl<Invoice> implements Invo
 
             id = RandomStringUtils.random(8, "0123456789abcdef");
             humanId = "582-SPI004090";                               // szamla sorszam
-            title = "IBM Power szerver garanciakiterjesztése";  // 2020-0109
+            title = dataGeneratorService.faker().commerce().productName();  // 2020-0109
             partner = partnerService.getById("004");               // 004
             completionDate = formatter.parse("2021-04-19");
             createDate = formatter.parse("2021-04-19");
@@ -279,7 +279,7 @@ public class InvoiceServiceImpl extends DataServiceImpl<Invoice> implements Invo
 
             id = RandomStringUtils.random(8, "0123456789abcdef");
             humanId = "9090010764";                                  // szamla sorszam
-            title = "IBM Power szerver garanciakiterjesztése";  // 2020-0109
+            title = dataGeneratorService.faker().commerce().productName();  // 2020-0109
             partner = partnerService.getById("005");               // 005
             completionDate = formatter.parse("2020-12-31");
             createDate = formatter.parse("2020-12-31");
@@ -306,7 +306,7 @@ public class InvoiceServiceImpl extends DataServiceImpl<Invoice> implements Invo
 
             id = RandomStringUtils.random(8, "0123456789abcdef");
             humanId = "VSz-2021/00091";                                  // szamla sorszam
-            title = "IBM Power szerver garanciakiterjesztése";      // 2020-0109
+            title = dataGeneratorService.faker().commerce().productName();      // 2020-0109
             partner = partnerService.getById("006");                   // 006
             completionDate = formatter.parse("2021-02-10");
             createDate = formatter.parse("2021-02-18");
@@ -333,7 +333,7 @@ public class InvoiceServiceImpl extends DataServiceImpl<Invoice> implements Invo
 
             id = RandomStringUtils.random(8, "0123456789abcdef");
             humanId = "EURSZLA0177/2022";                           // szamla sorszam
-            title = "Multivendor 2023 évre";                   // 2022-0227
+            title = dataGeneratorService.faker().commerce().productName();                   // 2022-0227
             partner = partnerService.getById("008");              // 008
             completionDate = formatter.parse("2022-12-30");
             createDate = formatter.parse("2022-12-30");
@@ -360,7 +360,7 @@ public class InvoiceServiceImpl extends DataServiceImpl<Invoice> implements Invo
 
             id = RandomStringUtils.random(8, "0123456789abcdef");
             humanId = "19044";                                       // szamla sorszam
-            title = "Multivendor 2023 évre";                   // 2022-0227
+            title = dataGeneratorService.faker().commerce().productName();                   // 2022-0227
             partner = partnerService.getById("009");              // 009
             completionDate = formatter.parse("2022-12-22");
             createDate = formatter.parse("2022-12-22");
@@ -387,7 +387,7 @@ public class InvoiceServiceImpl extends DataServiceImpl<Invoice> implements Invo
 
             id = RandomStringUtils.random(8, "0123456789abcdef");
             humanId = "9171058452";                                       // szamla sorszam
-            title = "Multivendor 2023 évre";                   // 2022-0227
+            title = dataGeneratorService.faker().commerce().productName();                   // 2022-0227
             partner = partnerService.getById("010");              // 010
             completionDate = formatter.parse("2022-12-30");
             createDate = formatter.parse("2023-01-13");
@@ -414,7 +414,7 @@ public class InvoiceServiceImpl extends DataServiceImpl<Invoice> implements Invo
 
             id = RandomStringUtils.random(8, "0123456789abcdef");
             humanId = "9171058628";                                       // szamla sorszam
-            title = "Multivendor 2023 évre";                   // 2022-0227
+            title = dataGeneratorService.faker().commerce().productName();                   // 2022-0227
             partner = partnerService.getById("010");              // 010
             completionDate = formatter.parse("2023-01-12");
             createDate = formatter.parse("2023-01-19");
@@ -441,7 +441,7 @@ public class InvoiceServiceImpl extends DataServiceImpl<Invoice> implements Invo
 
             id = RandomStringUtils.random(8, "0123456789abcdef");
             humanId = "9171058628";                                       // szamla sorszam
-            title = "Multivendor 2023 évre";                   // 2022-0227
+            title = dataGeneratorService.faker().commerce().productName();                   // 2022-0227
             partner = partnerService.getById("011");              // 011
             completionDate = formatter.parse("2022-12-23");
             createDate = formatter.parse("2022-12-23");
@@ -468,7 +468,7 @@ public class InvoiceServiceImpl extends DataServiceImpl<Invoice> implements Invo
 
             id = RandomStringUtils.random(8, "0123456789abcdef");
             humanId = "2022-SOV/000495";                                       // szamla sorszam
-            title = "Multivendor 2023 évre";                   // 2022-0227
+            title = dataGeneratorService.faker().commerce().productName();                   // 2022-0227
             partner = partnerService.getById("012");              // 012
             completionDate = formatter.parse("2022-12-31");
             createDate = formatter.parse("2022-12-31");
@@ -495,7 +495,7 @@ public class InvoiceServiceImpl extends DataServiceImpl<Invoice> implements Invo
 
             id = RandomStringUtils.random(8, "0123456789abcdef");
             humanId = "2022-SOV/000496";                            // szamla sorszam
-            title = "Multivendor 2023 évre";                   // 2022-0227
+            title = dataGeneratorService.faker().commerce().productName();                   // 2022-0227
             partner = partnerService.getById("012");              // 012
             completionDate = formatter.parse("2022-12-31");
             createDate = formatter.parse("2022-12-31");
@@ -522,7 +522,7 @@ public class InvoiceServiceImpl extends DataServiceImpl<Invoice> implements Invo
 
             id = RandomStringUtils.random(8, "0123456789abcdef");
             humanId = "E-SYMPR-2022-105";                            // szamla sorszam
-            title = "Multivendor 2023 évre";                   // 2022-0227
+            title = dataGeneratorService.faker().commerce().productName();                   // 2022-0227
             partner = partnerService.getById("013");              // 013
             completionDate = formatter.parse("2022-12-28");
             createDate = formatter.parse("2022-12-28");
@@ -549,7 +549,7 @@ public class InvoiceServiceImpl extends DataServiceImpl<Invoice> implements Invo
 
             id = RandomStringUtils.random(8, "0123456789abcdef");
             humanId = "17356/23";                                    // szamla sorszam
-            title = "LTO8 szalagok szállítása";                   // 2023-0018
+            title = dataGeneratorService.faker().commerce().productName();                   // 2023-0018
             partner = partnerService.getById("014");              // 014
             completionDate = formatter.parse("2023-02-06");
             createDate = formatter.parse("2023-02-06");
@@ -576,7 +576,7 @@ public class InvoiceServiceImpl extends DataServiceImpl<Invoice> implements Invo
 
             id = RandomStringUtils.random(8, "0123456789abcdef");
             humanId = "2023-SOV/000123";                                     // szamla sorszam
-            title = "PowerBuilder Professional licencek szállítása";    // 2023-0054
+            title = dataGeneratorService.faker().commerce().productName();    // 2023-0054
             partner = partnerService.getById("012");                       // 012
             completionDate = formatter.parse("2023-04-14");
             createDate = formatter.parse("2023-04-17");
@@ -601,10 +601,10 @@ public class InvoiceServiceImpl extends DataServiceImpl<Invoice> implements Invo
                     .build();
             result.add(entity);
 
-
+        } else {
             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
+            String title = dataGeneratorService.faker().commerce().productName();  // 2022-0027
             Partner partner = partnerService.getById("002");                  // 002
             Date completionDate = formatter.parse("2023-02-23");
             Date createDate = formatter.parse("2023-02-23");
@@ -631,7 +631,7 @@ public class InvoiceServiceImpl extends DataServiceImpl<Invoice> implements Invo
 
             id = RandomStringUtils.random(8, "0123456789abcdef");
             humanId = "2021/0001";                                  // szamla sorszam
-            title = "IBM Power szerver garanciakiterjesztése";      // 2020-0109
+            title = dataGeneratorService.faker().commerce().productName();      // 2020-0109
             partner = partnerService.getById("007");                   // 007
             completionDate = formatter.parse("2020-12-31");
             createDate = formatter.parse("2021-01-04");
@@ -656,10 +656,10 @@ public class InvoiceServiceImpl extends DataServiceImpl<Invoice> implements Invo
                     .build();
             result.add(entity);
 
-        } else {                                                // csak a kimeno szamlak generalasa
+                                               // csak a kimeno szamlak generalasa
             id = RandomStringUtils.random(8, "0123456789abcdef");
             humanId = "2021/0069";                                  // szamla sorszam
-            title = "IBM Power szerver garanciakiterjesztése";      // 2020-0109
+            title = dataGeneratorService.faker().commerce().productName();      // 2020-0109
             partner = partnerService.getById("007");                   // 007
             completionDate = formatter.parse("2021-03-09");
             createDate = formatter.parse("2021-03-10");
@@ -686,7 +686,7 @@ public class InvoiceServiceImpl extends DataServiceImpl<Invoice> implements Invo
 
             id = RandomStringUtils.random(8, "0123456789abcdef");
             humanId = "E-USER-2023-12";                            // szamla sorszam
-            title = "Multivendor 2023 évre";                   // 2022-0227
+            title = dataGeneratorService.faker().commerce().productName();                   // 2022-0227
             partner = partnerService.getById("017");              // 017
             completionDate = formatter.parse("2022-12-31");
             createDate = formatter.parse("2023-01-06");
@@ -714,7 +714,7 @@ public class InvoiceServiceImpl extends DataServiceImpl<Invoice> implements Invo
 
             id = RandomStringUtils.random(8, "0123456789abcdef");
             humanId = "E-USER-2023-13";                            // szamla sorszam
-            title = "Multivendor 2023 évre";                   // 2022-0227
+            title = dataGeneratorService.faker().commerce().productName();                   // 2022-0227
             partner = partnerService.getById("017");              // 017
             completionDate = formatter.parse("2022-12-31");
             createDate = formatter.parse("2023-01-06");
@@ -741,7 +741,7 @@ public class InvoiceServiceImpl extends DataServiceImpl<Invoice> implements Invo
 
             id = RandomStringUtils.random(8, "0123456789abcdef");
             humanId = "E-USER-2023-53";                             // szamla sorszam
-            title = "LTO8 szalagok szállítása";                // 2023-0018
+            title = dataGeneratorService.faker().commerce().productName();                // 2023-0018
             partner = partnerService.getById("015");              // 015
             completionDate = formatter.parse("2023-02-08");
             createDate = formatter.parse("2023-02-09.");
@@ -768,7 +768,7 @@ public class InvoiceServiceImpl extends DataServiceImpl<Invoice> implements Invo
 
             id = RandomStringUtils.random(8, "0123456789abcdef");
             humanId = "E-USER-2023-95";                                     // szamla sorszam
-            title = "PowerBuilder Professional licencek szállítása";    // 2023-0054
+            title = dataGeneratorService.faker().commerce().productName();    // 2023-0054
             partner = partnerService.getById("016");                       // 016
             completionDate = formatter.parse("2023-04-14");
             createDate = formatter.parse("2023-04-17");

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 c2ee70fb94a9a3ec2d7db4404f01c1fa70198d91..84301235b0864b2bb70cd1f43a97afa55eabe8e4 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,8 +20,6 @@ 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;