From c2ac1dfd4ee667ac9181f38c43152a7b29844038 Mon Sep 17 00:00:00 2001 From: Viachaslau Khandramai Date: Thu, 23 Feb 2023 12:12:16 +0300 Subject: [PATCH] MODEXPW-368 - Align csv-file format with bulk-operations (#413) * MODEXPW-368 - reverting addresses transformation * MODEXPW-368 - reverting addresses transformation --- .../bulkedit/jobs/BulkEditUserProcessor.java | 23 +++++++++---------- .../bulk_edit_user_identifiers_output.csv | 2 +- ...user_identifiers_output_some_not_found.csv | 2 +- .../bulk_edit_users_empty_reference.csv | 6 ++--- .../bulk_edit_users_reference_not_found.csv | 4 ++-- 5 files changed, 18 insertions(+), 19 deletions(-) diff --git a/src/main/java/org/folio/dew/batch/bulkedit/jobs/BulkEditUserProcessor.java b/src/main/java/org/folio/dew/batch/bulkedit/jobs/BulkEditUserProcessor.java index 902e89994..d0a580e3c 100644 --- a/src/main/java/org/folio/dew/batch/bulkedit/jobs/BulkEditUserProcessor.java +++ b/src/main/java/org/folio/dew/batch/bulkedit/jobs/BulkEditUserProcessor.java @@ -5,7 +5,6 @@ import static java.util.Optional.ofNullable; import static org.apache.commons.lang3.StringUtils.EMPTY; import static org.folio.dew.utils.BulkEditProcessorHelper.dateToString; -import static org.folio.dew.utils.BulkEditProcessorHelper.ofEmptyString; import static org.folio.dew.utils.Constants.ARRAY_DELIMITER; import static org.folio.dew.utils.Constants.ITEM_DELIMITER; import static org.folio.dew.utils.Constants.KEY_VALUE_DELIMITER; @@ -111,17 +110,17 @@ private String addressesToString(List
addresses, ErrorServiceArgs args) } private String addressToString(Address address, ErrorServiceArgs args) { - List data = new ArrayList<>(); - ofEmptyString(address.getId()).ifPresent(data::add); - ofEmptyString(address.getCountryId()).ifPresent(data::add); - ofEmptyString(address.getAddressLine1()).ifPresent(data::add); - ofEmptyString(address.getAddressLine2()).ifPresent(data::add); - ofEmptyString(address.getCity()).ifPresent(data::add); - ofEmptyString(address.getRegion()).ifPresent(data::add); - ofEmptyString(address.getPostalCode()).ifPresent(data::add); - ofNullable(address.getPrimaryAddress()).ifPresent(primary -> data.add(primary.toString())); - ofEmptyString(userReferenceService.getAddressTypeDescById(address.getAddressTypeId(), args)).ifPresent(data::add); - return String.join(ARRAY_DELIMITER, escaper.escape(data)); + List addressData = new ArrayList<>(); + addressData.add(ofNullable(address.getId()).orElse(EMPTY)); + addressData.add(ofNullable(address.getCountryId()).orElse(EMPTY)); + addressData.add(ofNullable(address.getAddressLine1()).orElse(EMPTY)); + addressData.add(ofNullable(address.getAddressLine2()).orElse(EMPTY)); + addressData.add(ofNullable(address.getCity()).orElse(EMPTY)); + addressData.add(ofNullable(address.getRegion()).orElse(EMPTY)); + addressData.add(ofNullable(address.getPostalCode()).orElse(EMPTY)); + addressData.add(nonNull(address.getPrimaryAddress()) ? address.getPrimaryAddress().toString() : EMPTY); + addressData.add(userReferenceService.getAddressTypeDescById(address.getAddressTypeId(), args)); + return String.join(ARRAY_DELIMITER, escaper.escape(addressData)); } private String customFieldsToString(Map map) { diff --git a/src/test/resources/output/bulk_edit_user_identifiers_output.csv b/src/test/resources/output/bulk_edit_user_identifiers_output.csv index ec102905b..5bd2e56f6 100644 --- a/src/test/resources/output/bulk_edit_user_identifiers_output.csv +++ b/src/test/resources/output/bulk_edit_user_identifiers_output.csv @@ -1,4 +1,4 @@ User name,User id,External system id,Barcode,Active,Type,Patron group,Departments,Proxy for,Last name,First name,Middle name,Preferred first name,Email,Phone,Mobile phone,Date of birth,Addresses,Preferred contact type id,Enrollment date,Expiration date,Created date,Updated date,Tags,Custom fields -morty,bec20636-fb68-41fd-84ea-2cf910673599,,456,true,,staff,,,morty,panic,,,morty@example.com,,,,BE;Address line 1;Address line 2;Some City;12345;Home Address,002,2020-10-07 04:00:00.000Z,,2021-12-03 14:25:55.129Z,2021-12-03 14:25:55.129Z,tag1;tag2;tag3,TestTextArea:morty's text area|TestRadio:r2|TestTextField:morty's text field|TestSingleSelect:ss2|TestMultiSelect:ms2;ms1|TestCheckbox:true +morty,bec20636-fb68-41fd-84ea-2cf910673599,,456,true,,staff,,,morty,panic,,,morty@example.com,,,,;BE;Address line 1;Address line 2;Some City;;12345;;Home Address,002,2020-10-07 04:00:00.000Z,,2021-12-03 14:25:55.129Z,2021-12-03 14:25:55.129Z,tag1;tag2;tag3,TestTextArea:morty's text area|TestRadio:r2|TestTextField:morty's text field|TestSingleSelect:ss2|TestMultiSelect:ms2;ms1|TestCheckbox:true rick,2205005b-ca51-4a04-87fd-938eefa8f6de,,123,true,,staff,,,rick,psych,,,rick@example.com,,,,,002,2020-10-07 04:00:00.000Z,,2021-12-05 03:23:39.674Z,2021-12-05 03:23:39.674Z,,TestMultiSelect: sheldon,b4cee18d-f862-4ef1-95a5-879fdd619603,,789,true,,staff,,,sheldon,bazinga,,,sheldon@example.com,,,,,002,,,2021-12-05 03:23:37.989Z,2021-12-05 03:23:37.989Z,, diff --git a/src/test/resources/output/bulk_edit_user_identifiers_output_some_not_found.csv b/src/test/resources/output/bulk_edit_user_identifiers_output_some_not_found.csv index 5b983d9ec..c64218729 100644 --- a/src/test/resources/output/bulk_edit_user_identifiers_output_some_not_found.csv +++ b/src/test/resources/output/bulk_edit_user_identifiers_output_some_not_found.csv @@ -1,3 +1,3 @@ User name,User id,External system id,Barcode,Active,Type,Patron group,Departments,Proxy for,Last name,First name,Middle name,Preferred first name,Email,Phone,Mobile phone,Date of birth,Addresses,Preferred contact type id,Enrollment date,Expiration date,Created date,Updated date,Tags,Custom fields -morty,bec20636-fb68-41fd-84ea-2cf910673599,,456,true,,staff,,,morty,panic,,,morty@example.com,,,,BE;Address line 1;Address line 2;Some City;12345;Home Address,002,2020-10-07 04:00:00.000Z,,2021-12-03 14:25:55.129Z,2021-12-03 14:25:55.129Z,tag1;tag2;tag3,TestTextArea:morty's text area|TestRadio:r2|TestTextField:morty's text field|TestSingleSelect:ss2|TestMultiSelect:ms2;ms1|TestCheckbox:true +morty,bec20636-fb68-41fd-84ea-2cf910673599,,456,true,,staff,,,morty,panic,,,morty@example.com,,,,;BE;Address line 1;Address line 2;Some City;;12345;;Home Address,002,2020-10-07 04:00:00.000Z,,2021-12-03 14:25:55.129Z,2021-12-03 14:25:55.129Z,tag1;tag2;tag3,TestTextArea:morty's text area|TestRadio:r2|TestTextField:morty's text field|TestSingleSelect:ss2|TestMultiSelect:ms2;ms1|TestCheckbox:true sheldon,b4cee18d-f862-4ef1-95a5-879fdd619603,,789,true,,staff,,,sheldon,bazinga,,,sheldon@example.com,,,,,002,,,2021-12-05 03:23:37.989Z,2021-12-05 03:23:37.989Z,, diff --git a/src/test/resources/output/bulk_edit_users_empty_reference.csv b/src/test/resources/output/bulk_edit_users_empty_reference.csv index a75c535d2..d5a90ab8c 100644 --- a/src/test/resources/output/bulk_edit_users_empty_reference.csv +++ b/src/test/resources/output/bulk_edit_users_empty_reference.csv @@ -1,4 +1,4 @@ User name,User id,External system id,Barcode,Active,Type,Patron group,Departments,Proxy for,Last name,First name,Middle name,Preferred first name,Email,Phone,Mobile phone,Date of birth,Addresses,Preferred contact type id,Enrollment date,Expiration date,Created date,Updated date,Tags,Custom fields -morty,bec20636-fb68-41fd-84ea-2cf910673599,,emptyAddressType,true,,staff,,,morty,panic,,,morty@example.com,,,,add1;add2;city,002,2020-10-07 04:00:00.000Z,,2022-03-31 09:05:38.808Z,2022-03-31 09:05:38.808Z,, -morty,bec20636-fb68-41fd-84ea-2cf910673599,,emptyPreferredContactTypeId,true,,staff,,,morty,panic,,,morty@example.com,,,,add1;add2;city;Home Address,,2020-10-07 04:00:00.000Z,,2022-03-31 09:05:38.808Z,2022-03-31 09:05:38.808Z,, -morty,bec20636-fb68-41fd-84ea-2cf910673599,,emptyDepartments,true,,staff,,,morty,panic,,,morty@example.com,,,,add1;add2;city;Home Address,002,2020-10-07 04:00:00.000Z,,2022-03-31 09:05:38.808Z,2022-03-31 09:05:38.808Z,, +morty,bec20636-fb68-41fd-84ea-2cf910673599,,emptyAddressType,true,,staff,,,morty,panic,,,morty@example.com,,,,;;add1;add2;city;;;;,002,2020-10-07 04:00:00.000Z,,2022-03-31 09:05:38.808Z,2022-03-31 09:05:38.808Z,, +morty,bec20636-fb68-41fd-84ea-2cf910673599,,emptyPreferredContactTypeId,true,,staff,,,morty,panic,,,morty@example.com,,,,;;add1;add2;city;;;;Home Address,,2020-10-07 04:00:00.000Z,,2022-03-31 09:05:38.808Z,2022-03-31 09:05:38.808Z,, +morty,bec20636-fb68-41fd-84ea-2cf910673599,,emptyDepartments,true,,staff,,,morty,panic,,,morty@example.com,,,,;;add1;add2;city;;;;Home Address,002,2020-10-07 04:00:00.000Z,,2022-03-31 09:05:38.808Z,2022-03-31 09:05:38.808Z,, diff --git a/src/test/resources/output/bulk_edit_users_reference_not_found.csv b/src/test/resources/output/bulk_edit_users_reference_not_found.csv index c4fe7aac3..be32dab20 100644 --- a/src/test/resources/output/bulk_edit_users_reference_not_found.csv +++ b/src/test/resources/output/bulk_edit_users_reference_not_found.csv @@ -1,3 +1,3 @@ User name,User id,External system id,Barcode,Active,Type,Patron group,Departments,Proxy for,Last name,First name,Middle name,Preferred first name,Email,Phone,Mobile phone,Date of birth,Addresses,Preferred contact type id,Enrollment date,Expiration date,Created date,Updated date,Tags,Custom fields -morty,bec20636-fb68-41fd-84ea-2cf910673599,,badAddressType,true,,staff,,,morty,panic,,,morty@example.com,,,,add1;add2;city;db541cda-fcc7-403b-8077-3613f3244901,002,2020-10-07 04:00:00.000Z,,2022-03-31 09:05:38.808Z,2022-03-31 09:05:38.808Z,, -morty,bec20636-fb68-41fd-84ea-2cf910673599,,badDepartments,true,,staff,103aee0f-c5f6-44de-94aa-74093f0e45d9,,morty,panic,,,morty@example.com,,,,add1;add2;city;Home Address,002,2020-10-07 04:00:00.000Z,,2022-03-31 09:05:38.808Z,2022-03-31 09:05:38.808Z,, +morty,bec20636-fb68-41fd-84ea-2cf910673599,,badAddressType,true,,staff,,,morty,panic,,,morty@example.com,,,,;;add1;add2;city;;;;db541cda-fcc7-403b-8077-3613f3244901,002,2020-10-07 04:00:00.000Z,,2022-03-31 09:05:38.808Z,2022-03-31 09:05:38.808Z,, +morty,bec20636-fb68-41fd-84ea-2cf910673599,,badDepartments,true,,staff,103aee0f-c5f6-44de-94aa-74093f0e45d9,,morty,panic,,,morty@example.com,,,,;;add1;add2;city;;;;Home Address,002,2020-10-07 04:00:00.000Z,,2022-03-31 09:05:38.808Z,2022-03-31 09:05:38.808Z,,