fix #739 (#741)

meveo-org · Jul 19, 2023 · f52570a · f52570a
1 parent 4079271
commit f52570a
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 3 deletions.
diff --git a/meveo-api/src/main/java/org/meveo/api/CustomEntityTemplateApi.java b/meveo-api/src/main/java/org/meveo/api/CustomEntityTemplateApi.java
@@ -643,9 +643,8 @@ private CustomEntityTemplate fromDTO(CustomEntityTemplateDto dto, CustomEntityTe
 
         if(dto.getCrudEventListenerScript() != null) {
         	var crudListenerScript = scriptInstanceService.findByCode(dto.getCrudEventListenerScript());
-        	cet.setCrudEventListenerScript(crudListenerScript);
-        	if(crudListenerScript == null) {
-        		throw new IllegalArgumentException("Script " + dto.getCrudEventListenerScript() + " does not exists");
+        	if(crudListenerScript != null) {
+        		cet.setCrudEventListenerScript(crudListenerScript);
         	}
         }
 

diff --git a/meveo-api/src/main/java/org/meveo/api/module/MeveoModuleApi.java b/meveo-api/src/main/java/org/meveo/api/module/MeveoModuleApi.java
@@ -1761,6 +1761,11 @@ public void applyChanges(MeveoModule module, Set<MeveoModuleItemDto> installItem
 			meveoModuleItemInstaller.uninstallItem(options, null, item);
 		}
 
+		// update CET
+		for (var itemDto : meveoModuleItemInstaller.getSortedModuleItems(installItems)) {
+		  meveoModuleItemInstaller.updateCetforCrudEventListenerScript(itemDto);
+		}
+
 		moduleCtx.end();
 
 		meveoModuleService.update(module);

diff --git a/meveo-api/src/main/java/org/meveo/api/module/MeveoModuleItemInstaller.java b/meveo-api/src/main/java/org/meveo/api/module/MeveoModuleItemInstaller.java
@@ -818,6 +818,37 @@ private void addCftToModuleItem(CustomRelationshipTemplateDto dto, MeveoModule m
 			}
 		}
 	}
+
+	public void updateCetforCrudEventListenerScript (MeveoModuleItemDto moduleItemDto) throws BusinessException {
+
+		if (moduleItemDto.getDtoClassName().equals(CustomEntityTemplateDto.class.getName())) {
+				CustomEntityTemplateDto cetDto =null;
+				if(moduleItemDto.getDtoData() instanceof CustomEntityTemplateDto){
+				cetDto = (CustomEntityTemplateDto) moduleItemDto.getDtoData();
+				} else {
+					try {
+						Class<? extends BaseEntityDto> dtoClass = (Class<? extends BaseEntityDto>) Class.forName(moduleItemDto.getDtoClassName());
+						cetDto = (CustomEntityTemplateDto) JacksonUtil.convert(moduleItemDto.getDtoData(), dtoClass);
+					} catch (ClassNotFoundException e) {
+						log.error("Cannot find dto class", e);
+						throw new BusinessException("cannot find crusdScript class "+moduleItemDto.getDtoClassName());
+					}
+				}
+				if (cetDto.getCrudEventListenerScript() != null) {
+					CustomEntityTemplate cet = customEntityTemplateService.findByCode(cetDto.getCode());
+					ScriptInstance si = scriptInstanceService.findByCode(cetDto.getCrudEventListenerScript());
+					if (si != null) {
+						cet.setCrudEventListenerScript(si);
+						customEntityTemplateService.update(cet);
+					} else {
+						throw new BusinessException("cannot find crusdScript "+cetDto.getTransientCrudEventListenerScript()+" of entity "+cetDto.getCode());
+					}
+				}
+
+		}
+
+}
+
 
 
 }