diff --git a/src/main/java/ru/nbch/credit_tracker/mapper/signal/UserPackageMapper.java b/src/main/java/ru/nbch/credit_tracker/mapper/signal/UserPackageMapper.java index cb8ce97..6481d0b 100644 --- a/src/main/java/ru/nbch/credit_tracker/mapper/signal/UserPackageMapper.java +++ b/src/main/java/ru/nbch/credit_tracker/mapper/signal/UserPackageMapper.java @@ -24,7 +24,7 @@ public interface UserPackageMapper { UserPackage findPackage(@Param("id") Integer id); - List findUserPackages(@Param("userId") String userId, @Param("status") String status); + List findUserPackages(@Param("userId") String userId, @Param("statuses") List status); List findAllPackagesByStatus(@Param("status") String status); diff --git a/src/main/java/ru/nbch/credit_tracker/service/SignalService.java b/src/main/java/ru/nbch/credit_tracker/service/SignalService.java index 8a55973..04b738d 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/SignalService.java +++ b/src/main/java/ru/nbch/credit_tracker/service/SignalService.java @@ -242,7 +242,7 @@ public class SignalService { } public List findActivePackages(String userId) { - return userPackageService.findUserPackages(userId, Status.ON_MONITORING); + return userPackageService.findUserPackages(userId, Status.ON_MONITORING, Status.PROCESSING); } public boolean isPackageExists(String username, String packageName) { diff --git a/src/main/java/ru/nbch/credit_tracker/service/signal/UserPackageService.java b/src/main/java/ru/nbch/credit_tracker/service/signal/UserPackageService.java index 33c169e..a1ffbf1 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/signal/UserPackageService.java +++ b/src/main/java/ru/nbch/credit_tracker/service/signal/UserPackageService.java @@ -6,6 +6,7 @@ import ru.nbch.credit_tracker.enums.Status; import ru.nbch.credit_tracker.mapper.signal.UserPackageMapper; import java.time.LocalDateTime; +import java.util.Arrays; import java.util.List; @Service @@ -45,8 +46,8 @@ public class UserPackageService { return mapper.findPackage(id); } - public List findUserPackages(String userId, Status status) { - return mapper.findUserPackages(userId.substring(0, 6), status.name()); + public List findUserPackages(String userId, Status... status) { + return mapper.findUserPackages(userId.substring(0, 6), Arrays.stream(status).map(Enum::name).toList()); } public List findAllPackagesByStatus(Status status) { diff --git a/src/main/resources/mybatis/mapper/signal/UserPackageMapper.xml b/src/main/resources/mybatis/mapper/signal/UserPackageMapper.xml index 5505f71..5b28f30 100644 --- a/src/main/resources/mybatis/mapper/signal/UserPackageMapper.xml +++ b/src/main/resources/mybatis/mapper/signal/UserPackageMapper.xml @@ -70,7 +70,10 @@ FROM signals_user_packages WHERE membercode IS NOT NULL AND LEFT(membercode, 6) = #{userId} - AND status = #{status} + AND status IN + + #{status} +