treshenkov/credit_tracker
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change active packeges selecting

Browse source
This commit is contained in:
Mikhail Trofimov 2025-07-21 11:41:37 +03:00
parent 82a028c664
commit 887c2ff06e
4 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/ru/nbch/credit_tracker/mapper/signal/UserPackageMapper.java
View file

@ -24,7 +24,7 @@ public interface UserPackageMapper {
UserPackage findPackage(@Param("id") Integer id); UserPackage findPackage(@Param("id") Integer id);
List<UserPackage> findUserPackages(@Param("userId") String userId, @Param("status") String status); List<UserPackage> findUserPackages(@Param("userId") String userId, @Param("statuses") List<String> status);
List<UserPackage> findAllPackagesByStatus(@Param("status") String status); List<UserPackage> findAllPackagesByStatus(@Param("status") String status);

2
src/main/java/ru/nbch/credit_tracker/service/SignalService.java
View file

@ -242,7 +242,7 @@ public class SignalService {
} }
public List<UserPackage> findActivePackages(String userId) { public List<UserPackage> 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) { public boolean isPackageExists(String username, String packageName) {

5
src/main/java/ru/nbch/credit_tracker/service/signal/UserPackageService.java
View file

@ -6,6 +6,7 @@ import ru.nbch.credit_tracker.enums.Status;
import ru.nbch.credit_tracker.mapper.signal.UserPackageMapper; import ru.nbch.credit_tracker.mapper.signal.UserPackageMapper;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.Arrays;
import java.util.List; import java.util.List;
@Service @Service
@ -45,8 +46,8 @@ public class UserPackageService {
return mapper.findPackage(id); return mapper.findPackage(id);
} }
public List<UserPackage> findUserPackages(String userId, Status status) { public List<UserPackage> findUserPackages(String userId, Status... status) {
return mapper.findUserPackages(userId.substring(0, 6), status.name()); return mapper.findUserPackages(userId.substring(0, 6), Arrays.stream(status).map(Enum::name).toList());
} }
public List<UserPackage> findAllPackagesByStatus(Status status) { public List<UserPackage> findAllPackagesByStatus(Status status) {

5
src/main/resources/mybatis/mapper/signal/UserPackageMapper.xml
View file

@ -70,7 +70,10 @@
FROM signals_user_packages FROM signals_user_packages
WHERE membercode IS NOT NULL WHERE membercode IS NOT NULL
AND LEFT(membercode, 6) = #{userId} AND LEFT(membercode, 6) = #{userId}
AND status = #{status} AND status IN
<foreach item="status" collection="statuses" open="(" separator="," close=")">
#{status}
</foreach>
</select> </select>
<select id="findAllPackagesByStatus" resultMap="packageDataResultMap" <select id="findAllPackagesByStatus" resultMap="packageDataResultMap"