galovics commented on code in PR #2777: URL: https://github.com/apache/fineract/pull/2777#discussion_r1072602144
########## fineract-provider/src/main/java/org/apache/fineract/cob/data/ProjectIdAndLastClosedBusinessDate.java: ########## @@ -0,0 +1,28 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.fineract.cob.data; + +import java.time.LocalDate; + +public interface ProjectIdAndLastClosedBusinessDate { Review Comment: Why don't we call this simply LoanIdAndLastClosedBusinessDate? ########## fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/async/SpringAsyncConfig.java: ########## @@ -0,0 +1,42 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.fineract.infrastructure.configuration.async; + +import java.util.concurrent.Executor; +import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.scheduling.annotation.AsyncConfigurer; +import org.springframework.scheduling.annotation.EnableAsync; +import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; + +@Configuration +@EnableAsync +public class SpringAsyncConfig implements AsyncConfigurer { + + @Bean(name = "loanCOBCatchUpThreadPoolTaskExecutor") + public Executor loanCOBCatchUpThreadPoolTaskExecutor() { + return new ThreadPoolTaskExecutor(); Review Comment: Let's set the thread prefix on the executor + you can set the max pool size to 1 since this executor is only intended to run on a single thread. ########## fineract-provider/src/main/java/org/apache/fineract/cob/service/AsyncLoanCOBExecutorServiceImpl.java: ########## @@ -0,0 +1,107 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.fineract.cob.service; + +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.util.Collections; +import java.util.List; +import java.util.Set; +import lombok.RequiredArgsConstructor; +import org.apache.fineract.cob.data.ProjectIdAndLastClosedBusinessDate; +import org.apache.fineract.cob.loan.LoanCOBConstant; +import org.apache.fineract.infrastructure.businessdate.domain.BusinessDateType; +import org.apache.fineract.infrastructure.core.domain.FineractContext; +import org.apache.fineract.infrastructure.core.service.ThreadLocalContextUtil; +import org.apache.fineract.infrastructure.jobs.data.JobParameterDTO; +import org.apache.fineract.infrastructure.jobs.domain.JobParameter; +import org.apache.fineract.infrastructure.jobs.domain.JobParameterRepository; +import org.apache.fineract.infrastructure.jobs.domain.ScheduledJobDetail; +import org.apache.fineract.infrastructure.jobs.domain.ScheduledJobDetailRepository; +import org.apache.fineract.infrastructure.jobs.exception.JobNotFoundException; +import org.apache.fineract.infrastructure.jobs.service.JobStarter; +import org.apache.fineract.portfolio.loanaccount.domain.LoanRepository; +import org.springframework.batch.core.Job; +import org.springframework.batch.core.JobParametersInvalidException; +import org.springframework.batch.core.configuration.JobLocator; +import org.springframework.batch.core.launch.NoSuchJobException; +import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException; +import org.springframework.batch.core.repository.JobInstanceAlreadyCompleteException; +import org.springframework.batch.core.repository.JobRestartException; +import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class AsyncLoanCOBExecutorServiceImpl implements AsyncLoanCOBExecutorService { + + private final LoanRepository loanRepository; + private final JobLocator jobLocator; + private final ScheduledJobDetailRepository scheduledJobDetailRepository; + private final JobStarter jobStarter; + private final JobParameterRepository jobParameterRepository; + + @Override + @Async("loanCOBCatchUpThreadPoolTaskExecutor") + public void executeLoanCOBCatchUpAsync(FineractContext context) { + try { + ThreadLocalContextUtil.init(context); + LocalDate cobBusinessDate = ThreadLocalContextUtil.getBusinessDateByType(BusinessDateType.COB_DATE); + List<ProjectIdAndLastClosedBusinessDate> projectIdAndLastClosedBusinessDate = loanRepository + .findOldestCOBProcessedLoan(cobBusinessDate); + LocalDate oldestCOBProcessedDate = !projectIdAndLastClosedBusinessDate.isEmpty() + ? projectIdAndLastClosedBusinessDate.get(0).getLastClosedBusinessDate() + : cobBusinessDate; + if (oldestCOBProcessedDate.isBefore(cobBusinessDate)) { + executeLoanCOBDayByDayUntilCOBBusinessDate(oldestCOBProcessedDate, cobBusinessDate); + } + } catch (NoSuchJobException e) { + throw new JobNotFoundException(LoanCOBConstant.JOB_NAME, e); + } catch (JobInstanceAlreadyCompleteException | JobRestartException | JobParametersInvalidException + | JobExecutionAlreadyRunningException e) { + throw new RuntimeException(e); + } finally { + ThreadLocalContextUtil.reset(); + } + } + + private void executeLoanCOBDayByDayUntilCOBBusinessDate(LocalDate oldestCOBProcessedDate, LocalDate cobBusinessDate) + throws NoSuchJobException, JobInstanceAlreadyCompleteException, JobExecutionAlreadyRunningException, + JobParametersInvalidException, JobRestartException { + Job job = jobLocator.getJob(LoanCOBConstant.JOB_NAME); + ScheduledJobDetail scheduledJobDetail = scheduledJobDetailRepository.findByJobName(LoanCOBConstant.JOB_HUMAN_READABLE_NAME); + LocalDate executingBusinessDate = oldestCOBProcessedDate.plusDays(1); + while (!executingBusinessDate.isAfter(cobBusinessDate)) { + JobParameterDTO jobParameterDTO = new JobParameterDTO(LoanCOBConstant.BUSINESS_DATE_PARAMETER_NAME, + executingBusinessDate.format(DateTimeFormatter.ISO_DATE)); + Set<JobParameterDTO> jobParameters = Collections.singleton(jobParameterDTO); + saveCatchUpJobParameter(scheduledJobDetail); + jobStarter.run(job, scheduledJobDetail, ThreadLocalContextUtil.getContext(), jobParameters); + executingBusinessDate = executingBusinessDate.plusDays(1); + } + } + + private void saveCatchUpJobParameter(ScheduledJobDetail scheduledJobDetail) { + JobParameter jobParameter = new JobParameter(); + jobParameter.setJobId(scheduledJobDetail.getId()); + jobParameter.setParameterName(LoanCOBConstant.IS_CATCH_UP_PARAMETER_NAME); + jobParameter.setParameterValue("1"); Review Comment: Can't we use booleans here instead of numbers? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
