Update the new development progress

haiphucnguyen · haiphucnguyen · commit 2b2aa8ccd1af · 2019-04-11T08:26:38.000-05:00
diff --git a/mycollab-esb/src/main/java/com/mycollab/module/project/esb/DeleteProjectBugCommand.kt b/mycollab-esb/src/main/java/com/mycollab/module/project/esb/DeleteProjectBugCommand.kt
@@ -26,6 +26,8 @@ import com.mycollab.module.ecm.service.ResourceService
 import com.mycollab.module.esb.GenericCommand
 import com.mycollab.module.file.AttachmentUtils
 import com.mycollab.module.project.ProjectTypeConstants
+import com.mycollab.module.project.dao.TicketKeyMapper
+import com.mycollab.module.project.domain.TicketKeyExample
 import org.springframework.stereotype.Component
 
 /**
@@ -35,16 +37,19 @@ import org.springframework.stereotype.Component
 @Component
 class DeleteProjectBugCommand(private val resourceService: ResourceService,
                               private val commentMapper: CommentMapper,
-                              private val tagService: TagService) : GenericCommand() {
+                              private val tagService: TagService,
+                              private val ticketKeyMapper: TicketKeyMapper) : GenericCommand() {
 
     @AllowConcurrentEvents
     @Subscribe
     fun removeBugs(event: DeleteProjectBugEvent) {
+        val bugIds = event.bugs.map { it.id }.toCollection(mutableListOf())
         event.bugs.forEach {
             removeRelatedFiles(event.accountId, it.projectid, it.id)
-            removeRelatedComments(it.id)
             removeRelatedTags(it.id)
         }
+        removeRelatedComments(bugIds)
+        removeTicketKeys(bugIds)
     }
 
     private fun removeRelatedFiles(accountId: Int, projectId: Int, bugId: Int) {
@@ -53,12 +58,18 @@ class DeleteProjectBugCommand(private val resourceService: ResourceService,
         resourceService.removeResource(attachmentPath, "", true, accountId)
     }
 
-    private fun removeRelatedComments(bugId: Int) {
+    private fun removeRelatedComments(bugIds: MutableList<Int>) {
         val ex = CommentExample()
-        ex.createCriteria().andTypeEqualTo(ProjectTypeConstants.BUG).andExtratypeidEqualTo(bugId)
+        ex.createCriteria().andTypeEqualTo(ProjectTypeConstants.BUG).andExtratypeidIn(bugIds)
         commentMapper.deleteByExample(ex)
     }
 
+    private fun removeTicketKeys(bugIds: MutableList<Int>) {
+        val ex = TicketKeyExample()
+        ex.createCriteria().andTicketidIn(bugIds).andTickettypeEqualTo(ProjectTypeConstants.BUG)
+        ticketKeyMapper.deleteByExample(ex)
+    }
+
     private fun removeRelatedTags(bugId: Int) {
         val ex = TagExample()
         ex.createCriteria().andTypeEqualTo(ProjectTypeConstants.BUG).andTypeidEqualTo("$bugId")
diff --git a/mycollab-esb/src/main/java/com/mycollab/module/project/esb/DeleteProjectRiskCommand.kt b/mycollab-esb/src/main/java/com/mycollab/module/project/esb/DeleteProjectRiskCommand.kt
@@ -26,6 +26,8 @@ import com.mycollab.module.ecm.service.ResourceService
 import com.mycollab.module.esb.GenericCommand
 import com.mycollab.module.file.AttachmentUtils
 import com.mycollab.module.project.ProjectTypeConstants
+import com.mycollab.module.project.dao.TicketKeyMapper
+import com.mycollab.module.project.domain.TicketKeyExample
 import org.springframework.stereotype.Component
 
 /**
@@ -35,16 +37,19 @@ import org.springframework.stereotype.Component
 @Component
 class DeleteProjectRiskCommand(private val resourceService: ResourceService,
                                private val commentMapper: CommentMapper,
-                               private val tagService: TagService) : GenericCommand() {
+                               private val tagService: TagService,
+                               private val ticketKeyMapper: TicketKeyMapper) : GenericCommand() {
 
     @AllowConcurrentEvents
     @Subscribe
     fun removeRisk(event: DeleteProjectRiskEvent) {
+        val riskIds = event.risks.map { it.id }.toCollection(mutableListOf())
         event.risks.forEach {
             removeRelatedFiles(event.accountId, it.projectid, it.id)
-            removeRelatedComments(it.id)
             removeRelatedTags(it.id)
         }
+        removeRelatedComments(riskIds)
+        removeTicketKeys(riskIds)
     }
 
     private fun removeRelatedFiles(accountId: Int, projectId: Int, riskId: Int) {
@@ -53,12 +58,18 @@ class DeleteProjectRiskCommand(private val resourceService: ResourceService,
         resourceService.removeResource(attachmentPath, "", true, accountId)
     }
 
-    private fun removeRelatedComments(riskId: Int) {
+    private fun removeRelatedComments(riskIds: MutableList<Int>) {
         val ex = CommentExample()
-        ex.createCriteria().andTypeEqualTo(ProjectTypeConstants.RISK).andExtratypeidEqualTo(riskId)
+        ex.createCriteria().andTypeEqualTo(ProjectTypeConstants.RISK).andExtratypeidIn(riskIds)
         commentMapper.deleteByExample(ex)
     }
 
+    private fun removeTicketKeys(riskIds: MutableList<Int>) {
+        val ex = TicketKeyExample()
+        ex.createCriteria().andTicketidIn(riskIds).andTickettypeEqualTo(ProjectTypeConstants.RISK)
+        ticketKeyMapper.deleteByExample(ex)
+    }
+
     private fun removeRelatedTags(riskId: Int) {
         val ex = TagExample()
         ex.createCriteria().andTypeEqualTo(ProjectTypeConstants.RISK).andTypeidEqualTo("$riskId")
diff --git a/mycollab-esb/src/main/java/com/mycollab/module/project/esb/DeleteProjectTaskCommand.kt b/mycollab-esb/src/main/java/com/mycollab/module/project/esb/DeleteProjectTaskCommand.kt
@@ -26,6 +26,8 @@ import com.mycollab.module.ecm.service.ResourceService
 import com.mycollab.module.esb.GenericCommand
 import com.mycollab.module.file.AttachmentUtils
 import com.mycollab.module.project.ProjectTypeConstants
+import com.mycollab.module.project.dao.TicketKeyMapper
+import com.mycollab.module.project.domain.TicketKeyExample
 import org.springframework.stereotype.Component
 
 /**
@@ -35,16 +37,19 @@ import org.springframework.stereotype.Component
 @Component
 class DeleteProjectTaskCommand(private val resourceService: ResourceService,
                                private val commentMapper: CommentMapper,
-                               private val tagService: TagService) : GenericCommand() {
+                               private val tagService: TagService,
+                               private val ticketKeyMapper: TicketKeyMapper) : GenericCommand() {
 
     @AllowConcurrentEvents
     @Subscribe
     fun removedTask(event: DeleteProjectTaskEvent) {
+        val taskIds = event.tasks.map { it.id }.toCollection(mutableListOf())
         event.tasks.forEach {
             removeRelatedFiles(event.accountId, it.projectid, it.id)
-            removeRelatedComments(it.id)
             removeRelatedTags(it.id)
         }
+        removeRelatedComments(taskIds)
+        removeTicketKeys(taskIds)
     }
 
     private fun removeRelatedFiles(accountId: Int, projectId: Int, taskId: Int) {
@@ -53,12 +58,18 @@ class DeleteProjectTaskCommand(private val resourceService: ResourceService,
         resourceService.removeResource(attachmentPath, "", true, accountId)
     }
 
-    private fun removeRelatedComments(taskId: Int) {
+    private fun removeRelatedComments(taskIds: MutableList<Int>) {
         val ex = CommentExample()
-        ex.createCriteria().andTypeEqualTo(ProjectTypeConstants.TASK).andExtratypeidEqualTo(taskId)
+        ex.createCriteria().andTypeEqualTo(ProjectTypeConstants.TASK).andExtratypeidIn(taskIds)
         commentMapper.deleteByExample(ex)
     }
 
+    private fun removeTicketKeys(taskIds: MutableList<Int>) {
+        val ex = TicketKeyExample()
+        ex.createCriteria().andTicketidIn(taskIds).andTickettypeEqualTo(ProjectTypeConstants.TASK)
+        ticketKeyMapper.deleteByExample(ex)
+    }
+
     private fun removeRelatedTags(taskId: Int) {
         val ex = TagExample()
         ex.createCriteria().andTypeEqualTo(ProjectTypeConstants.TASK).andTypeidEqualTo("$taskId")
diff --git a/mycollab-services/pom.xml b/mycollab-services/pom.xml
@@ -100,7 +100,7 @@
                     </dependency>
                 </dependencies>
                 <executions>
-
+<!--
                     <execution>
                         <id>Project Artifacts Generator</id>
                         <phase>validate</phase>
@@ -112,7 +112,7 @@
                             <overwrite>true</overwrite>
                         </configuration>
                     </execution>
-<!--
+
                     <execution>
                         <id>User Artifacts Generator</id>
                         <phase>validate</phase>
diff --git a/mycollab-services/src/main/java/com/mycollab/module/project/service/BugService.kt b/mycollab-services/src/main/java/com/mycollab/module/project/service/BugService.kt
@@ -54,7 +54,4 @@ interface BugService : IDefaultService<Int, BugWithBLOBs, BugSearchCriteria> {
 
     @Cacheable
     fun getComponentDefectsSummary(@CacheKey criteria: BugSearchCriteria): List<GroupItem>
-
-    @CacheEvict
-    fun massUpdateBugIndexes(mapIndexes: List<Map<String, Int>>, @CacheKey sAccountId: Int)
 }
diff --git a/mycollab-services/src/main/java/com/mycollab/module/project/service/TaskService.kt b/mycollab-services/src/main/java/com/mycollab/module/project/service/TaskService.kt
@@ -53,8 +53,5 @@ interface TaskService : IDefaultService<Int, Task, TaskSearchCriteria> {
     @Cacheable
     fun getAssignedTasksSummary(@CacheKey criteria: TaskSearchCriteria): List<GroupItem>
 
-    @CacheEvict
-    fun massUpdateTaskIndexes(mapIndexes: List<Map<String, Int>>, @CacheKey sAccountId: Int)
-
     fun massUpdateStatuses(oldStatus: String, newStatus: String, projectId: Int, @CacheKey sAccountId: Int)
 }
diff --git a/mycollab-services/src/main/java/com/mycollab/module/project/service/impl/BugServiceImpl.kt b/mycollab-services/src/main/java/com/mycollab/module/project/service/impl/BugServiceImpl.kt
@@ -106,6 +106,12 @@ class BugServiceImpl(private val bugMapper: BugMapper,
                 TagService::class.java, ProjectTicketService::class.java)))
     }
 
+    override fun removeWithSession(item: BugWithBLOBs, username: String?, sAccountId: Int) {
+        super.removeWithSession(item, username, sAccountId)
+        val event = DeleteProjectBugEvent(arrayOf(item), username, sAccountId)
+        asyncEventBus.post(event)
+    }
+
     override fun massRemoveWithSession(items: List<BugWithBLOBs>, username: String?, sAccountId: Int) {
         super.massRemoveWithSession(items, username, sAccountId)
         val event = DeleteProjectBugEvent(items.toTypedArray(), username, sAccountId)
@@ -134,19 +140,6 @@ class BugServiceImpl(private val bugMapper: BugMapper,
 
     override fun findById(bugId: Int, sAccountId: Int): SimpleBug? = bugMapperExt.getBugById(bugId)
 
-    override fun massUpdateBugIndexes(mapIndexes: List<Map<String, Int>>, @CacheKey sAccountId: Int) {
-        val jdbcTemplate = JdbcTemplate(dataSource)
-        jdbcTemplate.batchUpdate("UPDATE `m_prj_bug` SET `bugIndex`=? WHERE `id`=?", object : BatchPreparedStatementSetter {
-            @Throws(SQLException::class)
-            override fun setValues(preparedStatement: PreparedStatement, i: Int) {
-                preparedStatement.setInt(1, mapIndexes[i].getValue("index"))
-                preparedStatement.setInt(2, mapIndexes[i].getValue("id"))
-            }
-
-            override fun getBatchSize(): Int = mapIndexes.size
-        })
-    }
-
     companion object {
         init {
             ClassInfoMap.put(BugServiceImpl::class.java, ClassInfo(ModuleNameConstants.PRJ, ProjectTypeConstants.BUG))
diff --git a/mycollab-services/src/main/java/com/mycollab/module/project/service/impl/ProjectGenericItemServiceImpl.kt b/mycollab-services/src/main/java/com/mycollab/module/project/service/impl/ProjectGenericItemServiceImpl.kt
@@ -28,7 +28,8 @@ import org.springframework.stereotype.Service
  * @since 5.0.3
  */
 @Service
-class ProjectGenericItemServiceImpl(private val projectGenericItemMapper: ProjectGenericItemMapper) : DefaultSearchService<ProjectGenericItemSearchCriteria>(), ProjectGenericItemService {
+class ProjectGenericItemServiceImpl(private val projectGenericItemMapper: ProjectGenericItemMapper) :
+        DefaultSearchService<ProjectGenericItemSearchCriteria>(), ProjectGenericItemService {
 
     override val searchMapper: ISearchableDAO<ProjectGenericItemSearchCriteria>
         get() = projectGenericItemMapper
diff --git a/mycollab-services/src/main/java/com/mycollab/module/project/service/impl/TaskServiceImpl.kt b/mycollab-services/src/main/java/com/mycollab/module/project/service/impl/TaskServiceImpl.kt
@@ -137,6 +137,12 @@ class TaskServiceImpl(private val taskMapper: TaskMapper,
                 ProjectMemberService::class.java, MilestoneService::class.java, ItemTimeLoggingService::class.java)))
     }
 
+    override fun removeWithSession(item: Task, username: String?, sAccountId: Int) {
+        super.removeWithSession(item, username, sAccountId)
+        val event = DeleteProjectTaskEvent(arrayOf(item), username, sAccountId)
+        asyncEventBus.post(event)
+    }
+
     override fun massRemoveWithSession(items: List<Task>, username: String?, sAccountId: Int) {
         super.massRemoveWithSession(items, username, sAccountId)
         val event = DeleteProjectTaskEvent(items.toTypedArray(), username, sAccountId)
@@ -176,19 +182,6 @@ class TaskServiceImpl(private val taskMapper: TaskMapper,
         jdbcTemplate.update("UPDATE `m_prj_task` SET `status`=? WHERE `parentTaskId`=?", status, parentTaskId)
     }
 
-    override fun massUpdateTaskIndexes(mapIndexes: List<Map<String, Int>>, @CacheKey sAccountId: Int) {
-        val jdbcTemplate = JdbcTemplate(dataSource)
-        jdbcTemplate.batchUpdate("UPDATE `m_prj_task` SET `taskindex`=? WHERE `id`=?", object : BatchPreparedStatementSetter {
-            @Throws(SQLException::class)
-            override fun setValues(preparedStatement: PreparedStatement, i: Int) {
-                preparedStatement.setInt(1, mapIndexes[i].getValue("index"))
-                preparedStatement.setInt(2, mapIndexes[i].getValue("id"))
-            }
-
-            override fun getBatchSize(): Int = mapIndexes.size
-        })
-    }
-
     override fun massUpdateStatuses(oldStatus: String, newStatus: String, projectId: Int, @CacheKey sAccountId: Int) {
         val updateTaskStatus = Task()
         updateTaskStatus.status = newStatus

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,4 @@ interface BugService : IDefaultService<Int, BugWithBLOBs, BugSearchCriteria> {`
`54`	`54`
`55`	`55`	`@Cacheable`
`56`	`56`	`fun getComponentDefectsSummary(@CacheKey criteria: BugSearchCriteria): List<GroupItem>`
`57`		`-`
`58`		`- @CacheEvict`
`59`		`- fun massUpdateBugIndexes(mapIndexes: List<Map<String, Int>>, @CacheKey sAccountId: Int)`
`60`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,8 +53,5 @@ interface TaskService : IDefaultService<Int, Task, TaskSearchCriteria> {`
`53`	`53`	`@Cacheable`
`54`	`54`	`fun getAssignedTasksSummary(@CacheKey criteria: TaskSearchCriteria): List<GroupItem>`
`55`	`55`
`56`		`- @CacheEvict`
`57`		`- fun massUpdateTaskIndexes(mapIndexes: List<Map<String, Int>>, @CacheKey sAccountId: Int)`
`58`		`-`
`59`	`56`	`fun massUpdateStatuses(oldStatus: String, newStatus: String, projectId: Int, @CacheKey sAccountId: Int)`
`60`	`57`	`}`