diff --git a/src/main/java/org/tonality/model/Subscription.java b/src/main/java/org/tonality/model/Subscription.java
index f5ef8b559d357cb65d257acd2eb1f8a967412e17..3d7775ed2b1d0e1bd856ed035264b5de9f05bdf0 100644
--- a/src/main/java/org/tonality/model/Subscription.java
+++ b/src/main/java/org/tonality/model/Subscription.java
@@ -3,9 +3,6 @@ package org.tonality.model;
import lombok.Getter;
import lombok.Setter;
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
-import org.hibernate.Transaction;
import org.hibernate.annotations.CreationTimestamp;
import org.hibernate.annotations.UpdateTimestamp;
import org.tonality.type.SubscriptionStatus;
@@ -26,7 +23,7 @@ public class Subscription implements Serializable {
private long userId;
@Id
- private long albumId;
+ private long premiumAlbumId;
@Column(name = "username", nullable = false)
private String username;
@@ -68,6 +65,6 @@ public class Subscription implements Serializable {
}
public String toString() {
- return "Subscription: \n" + "userId :" + userId + "\n" + "username :" + username + "\n" + "albumId :" + albumId + "\n" + "albumName :" + albumName + "\n" + "artist :" + artist + "\n" + "status :" + status + "\n" + "createdAt :" + createdAt + "\n" + "updatedAt :" + updatedAt + "\n";
+ return "Subscription: \n" + "userId :" + userId + "\n" + "username :" + username + "\n" + "premiumAlbumId :" + premiumAlbumId + "\n" + "albumName :" + albumName + "\n" + "artist :" + artist + "\n" + "status :" + status + "\n" + "createdAt :" + createdAt + "\n" + "updatedAt :" + updatedAt + "\n";
}
}
diff --git a/src/main/java/org/tonality/model/SubscriptionId.java b/src/main/java/org/tonality/model/SubscriptionId.java
index 6ad39bf9187689e396683abf5cfca1403565665c..7b834d04b3713d7f50465a14868da4f0d9362cd2 100644
--- a/src/main/java/org/tonality/model/SubscriptionId.java
+++ b/src/main/java/org/tonality/model/SubscriptionId.java
@@ -12,27 +12,27 @@ public class SubscriptionId implements Serializable {
@Column(name = "user_id", nullable = false)
private long userId;
- @Column(name = "album_id", nullable = false)
- private long albumId;
+ @Column(name = "premium_album_id", nullable = false)
+ private long premiumAlbumId;
public SubscriptionId() {}
- public SubscriptionId(long userId, long albumId) {
+ public SubscriptionId(long userId, long premiumAlbumId) {
this.userId = userId;
- this.albumId = albumId;
+ this.premiumAlbumId = premiumAlbumId;
}
@Override
public boolean equals(Object o) {
if (o instanceof SubscriptionId) {
SubscriptionId other = (SubscriptionId) o;
- return (userId == other.userId) && (albumId == other.albumId);
+ return (userId == other.userId) && (premiumAlbumId == other.premiumAlbumId);
}
return false;
}
@Override
public int hashCode() {
- return (int) (userId + albumId);
+ return (int) (userId + premiumAlbumId);
}
}
diff --git a/src/main/java/org/tonality/repository/Subscription.java b/src/main/java/org/tonality/repository/Subscription.java
index a04e23961df011c5edd84f8808c86ae8ff674a7e..d419af0812deaa0df2724312f5eedee702baf0f2 100644
--- a/src/main/java/org/tonality/repository/Subscription.java
+++ b/src/main/java/org/tonality/repository/Subscription.java
@@ -22,12 +22,12 @@ public class Subscription extends BaseRepository<org.tonality.model.Subscription
return instance;
}
- public org.tonality.model.Subscription createSubscription(long userId, String username, long albumId, String albumName, String artist) {
+ public org.tonality.model.Subscription createSubscription(long userId, String username, long premiumAlbumId, String albumName, String artist) {
try {
org.tonality.model.Subscription subscription = new org.tonality.model.Subscription();
subscription.setUserId(userId);
subscription.setUsername(username);
- subscription.setAlbumId(albumId);
+ subscription.setPremiumAlbumId(premiumAlbumId);
subscription.setAlbumName(albumName);
subscription.setArtist(artist);
if (org.tonality.repository.Subscription.getInstance().add(subscription) == null) {
@@ -40,9 +40,9 @@ public class Subscription extends BaseRepository<org.tonality.model.Subscription
}
}
- public org.tonality.model.Subscription updateSubscription(long userId, long albumId, SubscriptionStatus status) {
+ public org.tonality.model.Subscription updateSubscription(long userId, long premiumAlbumId, SubscriptionStatus status) {
try {
- org.tonality.model.Subscription subscription = org.tonality.repository.Subscription.getInstance().getById(new org.tonality.model.SubscriptionId(userId, albumId));
+ org.tonality.model.Subscription subscription = org.tonality.repository.Subscription.getInstance().getById(new org.tonality.model.SubscriptionId(userId, premiumAlbumId));
subscription.setStatus(status);
if (update(subscription) == null) {
throw new Exception("Failed to update subscription");
@@ -138,10 +138,10 @@ public class Subscription extends BaseRepository<org.tonality.model.Subscription
}
}
- public boolean deleteSubscriptionsByAlbumId(long albumId) {
+ public boolean deleteSubscriptionsByAlbumId(long premiumAlbumId) {
try {
java.util.Map<String, Object> conditions = new java.util.HashMap<>();
- conditions.put("albumId", albumId);
+ conditions.put("premiumAlbumId", premiumAlbumId);
if (!delete(conditions)) {
throw new Exception("Failed to delete subscriptions");
}
@@ -161,7 +161,7 @@ public class Subscription extends BaseRepository<org.tonality.model.Subscription
for (int i = 1; i < 4; i++) {
for (int j = 1; j < 4; j++) {
entity.setUserId(i);
- entity.setAlbumId(j);
+ entity.setPremiumAlbumId(j);
entity.setUsername("User " + i);
entity.setAlbumName("Album " + j);
entity.setArtist("Artist " + 10);
@@ -194,12 +194,12 @@ public class Subscription extends BaseRepository<org.tonality.model.Subscription
// delete by entity
entity = new org.tonality.model.Subscription();
entity.setUserId(1);
- entity.setAlbumId(3);
+ entity.setPremiumAlbumId(3);
System.out.println("Successfully deleted : \n" + subscription.delete(entity));
// delete by conditions
andConditions = new java.util.HashMap<>();
- andConditions.put("albumId", 1);
+ andConditions.put("premiumAlbumId", 1);
System.out.println("Successfully deleted : \n" + subscription.delete(andConditions));
}
}
diff --git a/src/main/java/org/tonality/service/ISubscription.java b/src/main/java/org/tonality/service/ISubscription.java
index c335289d9fd2358418017aa67be2a814a5a50c4c..eb8c6820953af75b45adb40020cd60832277f3f8 100644
--- a/src/main/java/org/tonality/service/ISubscription.java
+++ b/src/main/java/org/tonality/service/ISubscription.java
@@ -18,8 +18,8 @@ public interface ISubscription {
long userId,
@WebParam(name = "username")
String username,
- @WebParam(name = "albumId")
- long albumId,
+ @WebParam(name = "premiumAlbumId")
+ long premiumAlbumId,
@WebParam(name = "albumName")
String albumName,
@WebParam(name = "artist")
@@ -31,8 +31,8 @@ public interface ISubscription {
org.tonality.model.Subscription updateSubscription(
@WebParam(name = "userId")
long userId,
- @WebParam(name = "albumId")
- long albumId,
+ @WebParam(name = "premiumAlbumId")
+ long premiumAlbumId,
@WebParam(name = "status")
org.tonality.type.SubscriptionStatus status
);
@@ -42,8 +42,8 @@ public interface ISubscription {
org.tonality.model.Subscription getSubscription(
@WebParam(name = "userId")
long userId,
- @WebParam(name = "albumId")
- long albumId
+ @WebParam(name = "premiumAlbumId")
+ long premiumAlbumId
);
@WebMethod
@@ -89,8 +89,8 @@ public interface ISubscription {
boolean deleteSubscription(
@WebParam(name = "userId")
long userId,
- @WebParam(name = "albumId")
- long albumId
+ @WebParam(name = "premiumAlbumId")
+ long premiumAlbumId
);
@WebMethod
@@ -101,7 +101,7 @@ public interface ISubscription {
@WebMethod
boolean deleteSubscriptionsByAlbumId(
- @WebParam(name = "albumId")
- long albumId
+ @WebParam(name = "premiumAlbumId")
+ long premiumAlbumId
);
}
diff --git a/src/main/java/org/tonality/service/Subscription.java b/src/main/java/org/tonality/service/Subscription.java
index ead0701d44847499f813c72f29dac874f835ef5d..25d4fc0a7fea22e3344d03dfaccae8a1c970152d 100644
--- a/src/main/java/org/tonality/service/Subscription.java
+++ b/src/main/java/org/tonality/service/Subscription.java
@@ -9,10 +9,10 @@ import java.util.List;
@WebService(endpointInterface = "org.tonality.service.ISubscription")
public class Subscription extends BaseWebService implements ISubscription {
@Override
- public org.tonality.model.Subscription createSubscription(long userId, String username, long albumId, String albumName, String artist) {
+ public org.tonality.model.Subscription createSubscription(long userId, String username, long premiumAlbumId, String albumName, String artist) {
try {
logRequest();
- return org.tonality.repository.Subscription.getInstance().createSubscription(userId, username, albumId, albumName, artist);
+ return org.tonality.repository.Subscription.getInstance().createSubscription(userId, username, premiumAlbumId, albumName, artist);
} catch (Exception e) {
e.printStackTrace();
return null;
@@ -20,10 +20,10 @@ public class Subscription extends BaseWebService implements ISubscription {
}
@Override
- public org.tonality.model.Subscription updateSubscription(long userId, long albumId, SubscriptionStatus status) {
+ public org.tonality.model.Subscription updateSubscription(long userId, long premiumAlbumId, SubscriptionStatus status) {
try {
logRequest();
- return org.tonality.repository.Subscription.getInstance().updateSubscription(userId, albumId, status);
+ return org.tonality.repository.Subscription.getInstance().updateSubscription(userId, premiumAlbumId, status);
} catch (Exception e) {
e.printStackTrace();
return null;
@@ -31,10 +31,10 @@ public class Subscription extends BaseWebService implements ISubscription {
}
@Override
- public org.tonality.model.Subscription getSubscription(long userId, long albumId) {
+ public org.tonality.model.Subscription getSubscription(long userId, long premiumAlbumId) {
try {
logRequest();
- return org.tonality.repository.Subscription.getInstance().getById(new SubscriptionId(userId, albumId));
+ return org.tonality.repository.Subscription.getInstance().getById(new SubscriptionId(userId, premiumAlbumId));
} catch (Exception e) {
e.printStackTrace();
return null;
@@ -75,10 +75,10 @@ public class Subscription extends BaseWebService implements ISubscription {
}
@Override
- public boolean deleteSubscription(long userId, long albumId) {
+ public boolean deleteSubscription(long userId, long premiumAlbumId) {
try {
logRequest();
- if (!org.tonality.repository.Subscription.getInstance().deleteById(new org.tonality.model.SubscriptionId(userId, albumId))) {
+ if (!org.tonality.repository.Subscription.getInstance().deleteById(new org.tonality.model.SubscriptionId(userId, premiumAlbumId))) {
throw new Exception("Failed to delete subscription");
}
return true;
@@ -100,10 +100,10 @@ public class Subscription extends BaseWebService implements ISubscription {
}
@Override
- public boolean deleteSubscriptionsByAlbumId(long albumId) {
+ public boolean deleteSubscriptionsByAlbumId(long premiumAlbumId) {
try {
logRequest();
- return org.tonality.repository.Subscription.getInstance().deleteSubscriptionsByAlbumId(albumId);
+ return org.tonality.repository.Subscription.getInstance().deleteSubscriptionsByAlbumId(premiumAlbumId);
} catch (Exception e) {
e.printStackTrace();
return false;