From ceb3b8ad15b900df769c54d2acf774f585ab6ed2 Mon Sep 17 00:00:00 2001 From: razzanYoni <13521087@mahasiswa.itb.ac.id> Date: Sat, 11 Nov 2023 16:39:01 +0700 Subject: [PATCH] refactor : subscription status type --- src/main/java/org/tonality/repository/Subscription.java | 2 +- src/main/java/org/tonality/type/SubscriptionStatus.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/tonality/repository/Subscription.java b/src/main/java/org/tonality/repository/Subscription.java index 17f85c5..8f1961e 100644 --- a/src/main/java/org/tonality/repository/Subscription.java +++ b/src/main/java/org/tonality/repository/Subscription.java @@ -45,7 +45,7 @@ public class Subscription extends BaseRepository<org.tonality.model.Subscription // get by conditions Map<String, Object> andConditions = new java.util.HashMap<>(); - andConditions.put("albumId", 1); + andConditions.put("status", org.tonality.type.SubscriptionStatus.ACTIVE.toString()); java.util.Map<String, Object> orConditions = new java.util.HashMap<>(); java.util.List<org.tonality.model.Subscription> entities = subscription.search(andConditions, orConditions); for (org.tonality.model.Subscription e : entities) { diff --git a/src/main/java/org/tonality/type/SubscriptionStatus.java b/src/main/java/org/tonality/type/SubscriptionStatus.java index 1c56b92..0ada308 100644 --- a/src/main/java/org/tonality/type/SubscriptionStatus.java +++ b/src/main/java/org/tonality/type/SubscriptionStatus.java @@ -1,11 +1,16 @@ package org.tonality.type; import javax.xml.bind.annotation.XmlEnum; +import javax.xml.bind.annotation.XmlEnumValue; @XmlEnum public enum SubscriptionStatus { + @XmlEnumValue("PENDING") PENDING, + @XmlEnumValue("ACTIVE") ACTIVE, + @XmlEnumValue("REJECTED") REJECTED, + @XmlEnumValue("EXPIRED") EXPIRED, } -- GitLab