Skip to content

Commit b782ae9

Browse files
committed
feat: enhance module deletion process with event processing and DTO mapping
1 parent 59fa55c commit b782ae9

File tree

2 files changed

+18
-14
lines changed

2 files changed

+18
-14
lines changed

backend/src/main/java/com/park/utmstack/service/application_modules/UtmModuleGroupService.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,14 @@
66
import com.park.utmstack.domain.application_modules.UtmModule;
77
import com.park.utmstack.domain.application_modules.UtmModuleGroup;
88
import com.park.utmstack.domain.application_modules.UtmModuleGroupConfiguration;
9+
import com.park.utmstack.event_processor.EventProcessorManagerService;
910
import com.park.utmstack.repository.UtmModuleGroupConfigurationRepository;
1011
import com.park.utmstack.repository.UtmModuleGroupRepository;
1112
import com.park.utmstack.repository.application_modules.UtmModuleRepository;
1213
import com.park.utmstack.service.application_events.ApplicationEventService;
1314
import com.park.utmstack.service.dto.application_modules.ModuleActivationDTO;
15+
import com.park.utmstack.service.dto.application_modules.ModuleDTO;
16+
import com.park.utmstack.service.dto.application_modules.UtmModuleMapper;
1417
import com.park.utmstack.service.dto.collectors.dto.CollectorConfigDTO;
1518
import com.park.utmstack.util.CipherUtil;
1619
import com.park.utmstack.util.exceptions.ApiException;
@@ -45,6 +48,8 @@ public class UtmModuleGroupService {
4548
private final ApplicationEventService applicationEventService;
4649
private final UtmModuleRepository moduleRepository;
4750
private final UtmModuleGroupConfigurationRepository moduleGroupConfigurationRepository;
51+
private final EventProcessorManagerService eventProcessorManagerService;
52+
private final UtmModuleMapper moduleMapper;
4853

4954

5055
/**
@@ -89,7 +94,7 @@ public Optional<UtmModuleGroup> findOne(Long id) {
8994
* @param id the id of the entity
9095
*/
9196

92-
public void delete(Long id) {
97+
public UtmModule delete(Long id) {
9398
final String ctx = CLASSNAME + ".delete";
9499
long start = System.currentTimeMillis();
95100

@@ -111,6 +116,8 @@ public void delete(Long id) {
111116
long duration = System.currentTimeMillis() - start;
112117
String successMsg = String.format("Configuration group (ID: %d) for module '%s' deleted successfully in %dms", id, moduleName, duration);
113118
applicationEventService.createEvent(successMsg, ApplicationEventType.CONFIG_GROUP_DELETE_SUCCESS, extra);
119+
120+
return moduleGroup.getModule();
114121
}
115122

116123

backend/src/main/java/com/park/utmstack/web/rest/application_modules/UtmModuleGroupResource.java

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,16 @@
77
import com.park.utmstack.domain.application_modules.UtmModuleGroupConfiguration;
88
import com.park.utmstack.domain.application_modules.factory.ModuleFactory;
99
import com.park.utmstack.domain.application_modules.types.ModuleConfigurationKey;
10+
import com.park.utmstack.event_processor.EventProcessorManagerService;
1011
import com.park.utmstack.service.application_events.ApplicationEventService;
1112
import com.park.utmstack.service.application_modules.UtmModuleGroupConfigurationService;
1213
import com.park.utmstack.service.application_modules.UtmModuleGroupService;
1314
import com.park.utmstack.service.application_modules.UtmModuleService;
15+
import com.park.utmstack.service.dto.application_modules.ModuleDTO;
16+
import com.park.utmstack.service.dto.application_modules.UtmModuleMapper;
1417
import com.park.utmstack.web.rest.util.HeaderUtil;
1518
import com.park.utmstack.web.rest.vm.ModuleGroupVM;
19+
import lombok.RequiredArgsConstructor;
1620
import org.slf4j.Logger;
1721
import org.slf4j.LoggerFactory;
1822
import org.springframework.dao.DataIntegrityViolationException;
@@ -32,6 +36,7 @@
3236
* REST controller for managing UtmConfigurationGroup.
3337
*/
3438
@RestController
39+
@RequiredArgsConstructor
3540
@RequestMapping("/api")
3641
public class UtmModuleGroupResource {
3742

@@ -45,18 +50,8 @@ public class UtmModuleGroupResource {
4550
private final ModuleFactory moduleFactory;
4651
private final UtmModuleService moduleService;
4752
private final UtmModuleGroupConfigurationService moduleGroupConfigurationService;
48-
49-
public UtmModuleGroupResource(UtmModuleGroupService moduleGroupService,
50-
ApplicationEventService eventService,
51-
ModuleFactory moduleFactory,
52-
UtmModuleService moduleService,
53-
UtmModuleGroupConfigurationService moduleGroupConfigurationService) {
54-
this.moduleGroupService = moduleGroupService;
55-
this.eventService = eventService;
56-
this.moduleFactory = moduleFactory;
57-
this.moduleService = moduleService;
58-
this.moduleGroupConfigurationService = moduleGroupConfigurationService;
59-
}
53+
private final UtmModuleMapper moduleMapper;
54+
private final EventProcessorManagerService eventProcessorManagerService;
6055

6156
@PostMapping("/utm-configuration-groups")
6257
@AuditEvent(
@@ -165,7 +160,9 @@ public ResponseEntity<UtmModuleGroup> getConfigurationGroup(@PathVariable Long g
165160
public ResponseEntity<Void> deleteSingleModuleGroup(@RequestParam Long groupId) {
166161
final String ctx = CLASSNAME + ".deleteSingleModuleGroup";
167162

168-
moduleGroupService.delete(groupId);
163+
UtmModule module = moduleGroupService.delete(groupId);
164+
ModuleDTO moduleDTO = moduleMapper.toDto(module, false);
165+
eventProcessorManagerService.updateModule(moduleDTO);
169166
return ResponseEntity.ok().build();
170167

171168
}

0 commit comments

Comments
 (0)