Skip to content

Commit

Permalink
#397 Modifications to enable the update of an empty RelationReference…
Browse files Browse the repository at this point in the history 
… type field
  • Loading branch information
@iratigarzon
iratigarzon committed Apr 11, 2024
1 parent 41ce0d2 commit aa47e85
Showing 1 changed file with 73 additions and 45 deletions.
118 changes: 73 additions & 45 deletions ...y2JavaAPI/src/main/java/eu/europa/ec/re3gistry2/javaapi/handler/RegBulkImportHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ private static StringBuilder generateCsvFileBuffer(List<RegFieldmapping> regFiel
for (RegFieldmapping field : regFieldMappingListWithoutStatus) {
writer.append("|");
writer.append(field.getRegField().getLocalid());
if(field.getHashref()){
if (field.getHashref()) {
writer.append("|ref");
}
}
Expand Down Expand Up @@ -462,16 +462,16 @@ private StringBuilder findWrongFields(List<String> headerListSplitted, ArrayList
final String fieldString = headerListSplitted.get(i);

try {
if(fieldString.equalsIgnoreCase("ref")){
if (fieldString.equalsIgnoreCase("ref")) {
RegField myRegField = new RegField();
myRegField.setUuid("ref");
myRegField.setRegFieldtype(regFieldTypeManager.get("1"));
fieldsHeader.add(myRegField);
} else{
RegField customFieldField = regFieldManager.getByLocalid(fieldString);
fieldsHeader.add(customFieldField);
} else {
RegField customFieldField = regFieldManager.getByLocalid(fieldString);
fieldsHeader.add(customFieldField);
}

} catch (Exception exx) {

if (fieldString.startsWith(BaseConstants.KEY_BULK_COLLECTION)) {
Expand Down Expand Up @@ -1261,7 +1261,7 @@ private RegAction regActionCheck(RegUser regUser, RegItem regItemRegister, RegIt
private void storeProposedItems(HashMap<String, ArrayList<FieldsBulkImport>> itemsBulk, RegItem regItemContainer, RegUser regUser, RegItemclass regItemclassChild, RegAction regAction, HttpServletRequest request, ArrayList<String> additionLines, Boolean isBulkEdit) throws Exception {

if (isBulkEdit) {
storeProposedItemsBulkEdit(itemsBulk, regUser, regItemclassChild, request, additionLines);
storeProposedItemsBulkEdit(itemsBulk, regItemContainer, regUser, regItemclassChild, request, additionLines);
} else {
storeProposedItemsBulkImport(itemsBulk, regItemContainer, regUser, regItemclassChild, regAction, request);
}
Expand All @@ -1270,6 +1270,8 @@ private void storeProposedItems(HashMap<String, ArrayList<FieldsBulkImport>> ite
private void storeProposedItemsBulkImport(HashMap<String, ArrayList<FieldsBulkImport>> itemsBulkImport, RegItem regItemContainer, RegUser regUser, RegItemclass regItemclassChild, RegAction regAction, HttpServletRequest request) throws Exception {

RegItemproposed regItemproposed;
RegItemManager regItemManager = new RegItemManager(entityManager);
RegItem regItemExistentAlready = null;

for (Map.Entry<String, ArrayList<FieldsBulkImport>> items : itemsBulkImport.entrySet()) {
try {
Expand All @@ -1282,53 +1284,57 @@ private void storeProposedItemsBulkImport(HashMap<String, ArrayList<FieldsBulkIm
request.setAttribute(BaseConstants.KEY_REQUEST_BULK_ERROR, operationResult);
throw new Exception();
}
String localId = items.getKey();
regItemproposed = createItemProposed(regItemContainer, regItemclassChild, localId, regUser, regAction, request);
ArrayList<FieldsBulkImport> array = items.getValue();

String localId = items.getKey();
regItemproposed = createItemProposed(regItemContainer, regItemclassChild, localId, regUser, regAction, request);
ArrayList<FieldsBulkImport> array = items.getValue();

RegLanguagecodeManager regLanguagecodeManager = new RegLanguagecodeManager(entityManager);
RegLanguagecode masterLanguage = regLanguagecodeManager.getMasterLanguage();
RegLanguagecodeManager regLanguagecodeManager = new RegLanguagecodeManager(entityManager);
RegLanguagecode masterLanguage = regLanguagecodeManager.getMasterLanguage();

ArrayList<FieldsBulkImport> fieldsBulkImportListLocal = new ArrayList<>();
for (FieldsBulkImport fieldsBulkImport : array) {
RegLanguagecode fieldLanguage = fieldsBulkImport.getLanguage();
if (fieldLanguage.equals(masterLanguage)) {
storeItemFromBulk(fieldsBulkImport, regItemContainer, regItemclassChild, regItemproposed, localId, array, fieldLanguage, masterLanguage);
} else {
fieldsBulkImportListLocal.add(fieldsBulkImport);
ArrayList<FieldsBulkImport> fieldsBulkImportListLocal = new ArrayList<>();
for (FieldsBulkImport fieldsBulkImport : array) {
RegLanguagecode fieldLanguage = fieldsBulkImport.getLanguage();
if (fieldLanguage.equals(masterLanguage)) {
storeItemFromBulk(fieldsBulkImport, regItemContainer, regItemclassChild, regItemproposed, localId, fieldLanguage, masterLanguage);
} else {
fieldsBulkImportListLocal.add(fieldsBulkImport);
}
}
}

if (!fieldsBulkImportListLocal.isEmpty()) {
for (FieldsBulkImport fieldsBulkImport : fieldsBulkImportListLocal) {
RegLanguagecode fieldLanguage = fieldsBulkImport.getLanguage();
storeItemFromBulk(fieldsBulkImport, regItemContainer, regItemclassChild, regItemproposed, localId, array, fieldLanguage, masterLanguage);
if (!fieldsBulkImportListLocal.isEmpty()) {
for (FieldsBulkImport fieldsBulkImport : fieldsBulkImportListLocal) {
RegLanguagecode fieldLanguage = fieldsBulkImport.getLanguage();
storeItemFromBulk(fieldsBulkImport, regItemContainer, regItemclassChild, regItemproposed, localId, fieldLanguage, masterLanguage);
}
}
}

}

}


private void storeProposedItemsBulkEdit(HashMap<String, ArrayList<FieldsBulkImport>> itemsBulkImport, RegUser regUser, RegItemclass regItemclassChild, HttpServletRequest request, ArrayList<String> additionLines) throws Exception {
private void storeProposedItemsBulkEdit(HashMap<String, ArrayList<FieldsBulkImport>> itemsBulkImport, RegItem regItemContainer, RegUser regUser, RegItemclass regItemclassChild, HttpServletRequest request, ArrayList<String> additionLines) throws Exception {

RegItemManager regItemManager = new RegItemManager(entityManager);
RegItemproposedHandler regItemproposedHandler = new RegItemproposedHandler();
RegLocalizationManager regLocalizationManager = new RegLocalizationManager(entityManager);

String ref = null;
HashMap<String, String> refMaps = new HashMap();
for (Map.Entry<String, ArrayList<FieldsBulkImport>> items : itemsBulkImport.entrySet()) {
HashMap<RegField, String> map = items.getValue().get(0).getRegFieldsHashMap();
Iterator<Map.Entry<RegField, String>> iterator = map.entrySet().iterator();
while (iterator.hasNext()) {
while (iterator.hasNext()) {
Map.Entry<RegField, String> entry = iterator.next();
if (entry.getKey().getUuid().equalsIgnoreCase("ref")) {
refMaps.put(items.getKey(), entry.getValue());
iterator.remove();
}
if (entry.getKey().getUuid().equalsIgnoreCase("ref")) {
refMaps.put(items.getKey(), entry.getValue());

iterator.remove();
}
}
}

RegItem regItemExistentAlready = null;

Map.Entry<String, ArrayList<FieldsBulkImport>> any = itemsBulkImport.entrySet().iterator().next();
Expand All @@ -1340,6 +1346,7 @@ private void storeProposedItemsBulkEdit(HashMap<String, ArrayList<FieldsBulkImpo
request.setAttribute(BaseConstants.KEY_REQUEST_BULK_ERROR, operationResult);
throw new Exception();
}
Integer i = 0;
for (Map.Entry<String, ArrayList<FieldsBulkImport>> items : itemsBulkImport.entrySet()) {
try {
try {
Expand All @@ -1352,29 +1359,52 @@ private void storeProposedItemsBulkEdit(HashMap<String, ArrayList<FieldsBulkImpo
request.setAttribute(BaseConstants.KEY_REQUEST_BULK_ERROR, operationResult);
throw new Exception();
}
List<RegLocalization> regLocalizations;
String localId = items.getKey();

if (regItemExistentAlready != null) {
items.getValue().get(0).getRegFieldsHashMap().values();
HashMap<RegField, String> fields = items.getValue().get(0).getRegFieldsHashMap();

RegItem regItemIterator = regItemManager.getByLocalidAndRegItemClass(items.getKey(), regItemclassChild);
String language = items.getValue().get(0).getLanguage().getUuid();
for (Map.Entry<String, String> refIndex : refMaps.entrySet()){
if(refIndex.getKey().equalsIgnoreCase(items.getKey())){

for (Map.Entry<String, String> refIndex : refMaps.entrySet()) {
if (refIndex.getKey().equalsIgnoreCase(items.getKey())) {
ref = refMaps.get(items.getKey());
}
}
regItemproposedHandler.completeCopyRegItemToRegItemporposedBulkEdit(regItemIterator, regUser, fields, additionLines, language, ref);

RegItemproposed regItemProposedModify = regItemproposedHandler.completeCopyRegItemToRegItemporposedBulkEdit(regItemIterator, regUser, fields, additionLines, language, ref);
ref = null;
ArrayList<FieldsBulkImport> array = items.getValue();
for (FieldsBulkImport fieldsBulkImport : array) {
HashMap<RegField, String> fields2 = fieldsBulkImport.getRegFieldsHashMap();
HashMap<RegField, RegItem> mapCollection = fieldsBulkImport.getRegFieldsCollectionHashMap();
for (Map.Entry<RegField, String> entry : fields2.entrySet()) {
regLocalizations = regLocalizationManager.getAll(entry.getKey(), regItemExistentAlready);

if (regLocalizations.isEmpty()) {

RegLanguagecode fieldLanguage = fieldsBulkImport.getLanguage();
storeRelarionReference(entry.getValue(), entry.getKey(), regItemProposedModify, mapCollection, regItemclassChild, fieldLanguage, localId, fieldsBulkImport);

}
regLocalizations.clear();
}

}

}
} catch (Exception ex) {
throw new Exception();
}
i++;
}

}

private void storeItemFromBulk(FieldsBulkImport fieldsBulkImport, RegItem regItemContainer, RegItemclass regItemclassChild, RegItemproposed regItemproposed, String localId, ArrayList<FieldsBulkImport> array, RegLanguagecode fieldLanguage, RegLanguagecode masterLanguage) throws Exception {
private void storeItemFromBulk(FieldsBulkImport fieldsBulkImport, RegItem regItemContainer, RegItemclass regItemclassChild, RegItemproposed regItemproposed, String localId, RegLanguagecode fieldLanguage, RegLanguagecode masterLanguage) throws Exception {
HashMap<RegField, String> map = fieldsBulkImport.getRegFieldsHashMap();
HashMap<RegField, RegItem> mapCollection = fieldsBulkImport.getRegFieldsCollectionHashMap();
String ref = null;
Expand All @@ -1388,8 +1418,6 @@ private void storeItemFromBulk(FieldsBulkImport fieldsBulkImport, RegItem regIte
}
}



for (Map.Entry<RegField, String> entry : map.entrySet()) {
Object object = entry.getKey();
String fieldValue = entry.getValue();
Expand All @@ -1411,12 +1439,12 @@ private void storeItemFromBulk(FieldsBulkImport fieldsBulkImport, RegItem regIte
}
break;
default:
storeLocalization(fieldLanguage, regItemproposed, regField, masterLanguage, fieldValue, localId, array, ref);
storeLocalization(fieldLanguage, regItemproposed, regField, masterLanguage, fieldValue, localId, ref);
break;
}
}
}
if(entry.getKey().getUuid().equalsIgnoreCase("ReferenceLink")){
if (entry.getKey().getUuid().equalsIgnoreCase("ReferenceLink")) {
ref = null;
}
}
Expand Down Expand Up @@ -1949,7 +1977,7 @@ private String[] processFieldName(String key) {
return outs;
}

private void storeLocalization(RegLanguagecode fieldLanguage, RegItemproposed regItemproposed, RegField regField, RegLanguagecode masterLanguage, String fieldValue, String localId, ArrayList<FieldsBulkImport> array, String ref) throws Exception {
private void storeLocalization(RegLanguagecode fieldLanguage, RegItemproposed regItemproposed, RegField regField, RegLanguagecode masterLanguage, String fieldValue, String localId, String ref) throws Exception {
RegLocalizationproposedManager regLocalizationproposedManager = new RegLocalizationproposedManager(entityManager);

RegLocalizationproposed regLocalizationproposed = new RegLocalizationproposed();
Expand All @@ -1967,7 +1995,7 @@ private void storeLocalization(RegLanguagecode fieldLanguage, RegItemproposed re
regLocalizationproposed.setRegLocalizationReference(null);
regLocalizationproposed.setValue(fieldValue);
regLocalizationproposed.setHref(null);
if(ref!=null){
if (ref != null) {
regLocalizationproposed.setHref(ref);
}
regLocalizationproposed.setRegAction(regItemproposed.getRegAction());
Expand Down

0 comments on commit aa47e85

Please sign in to comment.