Merge branch 'dev_marcos' into 'developer'

Dev marcos

See merge request ByteBot/web/bytebot-service!18

src/main/java/com/bytesw/bytebot/model/SchedulerTask.java

@@ -50,10 +50,10 @@ public class SchedulerTask implements Serializable {
     @Column(name= "cale_id")
     private String calendarID;
 
-    @ManyToOne(optional = false)
-    @NotFound(action = NotFoundAction.IGNORE)
-    @JoinColumn(name = "CALE_ID", referencedColumnName = "CALE_ID", nullable = false)
-    private Calendar calendar;
+//    @ManyToOne(optional = false)
+//    @NotFound(action = NotFoundAction.IGNORE)
+//    @JoinColumn(name = "CALE_ID", referencedColumnName = "CALE_ID", nullable = false)
+//    private Calendar calendar;
 
 
     /*@ManyToOne(optional = false)

src/main/java/com/bytesw/bytebot/repository/SchedulerTaskRepository.java

@@ -12,7 +12,7 @@ import java.util.Optional;
 
 public interface SchedulerTaskRepository extends CrudRepository<SchedulerTask, BigInteger>, JpaSpecificationExecutor<SchedulerTask> {
 
-    @Query("select b from SchedulerTask b where b.calendar.id = :calendarId")
+    @Query("select b from SchedulerTask b where b.calendarID = :calendarId")
     Optional<List<SchedulerTask>> findByCalendarId(@Param("calendarId") String calendarId);
 
     @Query("select b from SchedulerTask b where b.processETL = :processId")

src/main/java/com/bytesw/bytebot/service/CalendarService.java

@@ -128,11 +128,11 @@ public class CalendarService extends XDFService<Calendar, CalendarBean, String>
             if (weekSchedulerBean.getId() != null) {
                 Optional<WeekScheduler> weekSchedulerOptional = this.weekSchedulerRepository.findById(weekSchedulerBean.getId());
                 if (weekSchedulerOptional.isPresent()) {
+                    weekIds.add(weekSchedulerOptional.get().getId());
                     if (delete) {
                         this.weekSchedulerRepository.delete(weekSchedulerOptional.get());
                         continue;
                     }
-                    weekIds.add(weekSchedulerOptional.get().getId());
                     weekScheduler = weekSchedulerOptional.get();
                 } else {
                     weekScheduler = new WeekScheduler();
@@ -158,7 +158,7 @@ public class CalendarService extends XDFService<Calendar, CalendarBean, String>
         if (weekSchedulerBeanListBD.isPresent()){
             for (WeekScheduler weekScheduler: weekSchedulerBeanListBD.get()) {
                 if (!weekIds.contains(weekScheduler.getId())) {
-                    weekSchedulerRepository.deleteById(weekScheduler.getId());
+                        weekSchedulerRepository.deleteById(weekScheduler.getId());
                 }
             }
         }
@@ -174,6 +174,9 @@ public class CalendarService extends XDFService<Calendar, CalendarBean, String>
 
             if (calendarExceptionBean.getId() != null) {
                 Optional<CalendarException> calendarExceptionOptional = calendarExceptionRepository.findById(calendarExceptionBean.getId());
+                if (calendarExceptionOptional.isPresent()) {
+                    exceptionIds.add(calendarExceptionBean.getId());
+                }
                 if (calendarExceptionBean.isDelete()) {
                     calendarExceptionRepository.delete(calendarExceptionOptional.get());
                     continue;
@@ -183,7 +186,6 @@ public class CalendarService extends XDFService<Calendar, CalendarBean, String>
                 if (!calendarExceptionOptional.get().getFrequencyType().equals(calendarExceptionBean.getFrequencyType())) {
                     calendarExceptionRepository.delete(calendarExceptionOptional.get());
                 } else {
-                    exceptionIds.add(calendarExceptionBean.getId());
                     calendarExceptionBean.setCalendar(bean);
                     calendarException = calendarExceptionService.toModel(calendarExceptionOptional.get(), calendarExceptionBean);
                     calendarExceptionRepository.save(calendarException);