Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import com.restroly.qrmenu.subscription.repository.*;
import com.restroly.qrmenu.subscription.service.SubscriptionService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

Expand All @@ -19,6 +20,15 @@
@Service
public class SubscriptionServiceImpl implements SubscriptionService {

@Value("${subscription.status.active}")
private String STATUS_ACTIVE;

@Value("${subscription.status.cancelled}")
private String STATUS_CANCELLED;

@Value("${subscription.status.expired}")
private String STATUS_EXPIRED;

@Autowired
private SubscriptionPlanRepository planRepository;

Expand Down Expand Up @@ -126,7 +136,7 @@ public RestaurantSubscriptionDto assignPlanToRestaurant(Long restaurantId, Resta
Optional<RestaurantSubscription> existingActive = restaurantSubscriptionRepository.findActiveSubscriptionByRestaurantId(restaurantId);
if (existingActive.isPresent()) {
RestaurantSubscription activeSub = existingActive.get();
activeSub.setStatus("CANCELLED");
activeSub.setStatus(STATUS_CANCELLED);
activeSub.setEndDate(LocalDateTime.now());
restaurantSubscriptionRepository.save(activeSub);
}
Expand All @@ -139,7 +149,7 @@ public RestaurantSubscriptionDto assignPlanToRestaurant(Long restaurantId, Resta
.plan(plan)
.startDate(startDate)
.endDate(endDate)
.status("ACTIVE")
.status(STATUS_ACTIVE)
.isAutoRenew(request.getIsAutoRenew() != null ? request.getIsAutoRenew() : true)
.build();

Expand Down
7 changes: 7 additions & 0 deletions RestroHub/src/main/resources/application-dev.properties
Original file line number Diff line number Diff line change
Expand Up @@ -75,3 +75,10 @@ cloudinary.api-secret=${CLOUDINARY_API_SECRET:test}
# Service Requests Configuration
# ===============================
service.request.types=CALL_WAITER,REQUEST_BILL

# ===============================
# Subscription Status
# ===============================
subscription.status.active=ACTIVE
subscription.status.cancelled=CANCELLED
subscription.status.expired=EXPIRED
8 changes: 8 additions & 0 deletions RestroHub/src/main/resources/application-prod.properties
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,11 @@ server.ssl.key-store-type=PKCS12
logging.level.root=WARN
logging.level.com.restroly=INFO
logging.level.org.springframework.security=WARN


# ===============================
# Subscription Status
# ===============================
subscription.status.active=ACTIVE
subscription.status.cancelled=CANCELLED
subscription.status.expired=EXPIRED
8 changes: 8 additions & 0 deletions RestroHub/src/main/resources/application-test.properties
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,11 @@ cloudinary.api-secret=test-api-secret
# ===============================
logging.level.com.restroly=DEBUG
logging.level.org.springframework.security=DEBUG


# ===============================
# Subscription Status
# ===============================
subscription.status.active=ACTIVE
subscription.status.cancelled=CANCELLED
subscription.status.expired=EXPIRED
8 changes: 8 additions & 0 deletions RestroHub/src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -136,3 +136,11 @@ spring.servlet.multipart.max-request-size=10MB
# Service Requests Configuration
# ===============================
service.request.types=CALL_WAITER,REQUEST_BILL

# ===============================
# Subscription Status
# ===============================
subscription.status.active=ACTIVE
subscription.status.cancelled=CANCELLED
subscription.status.expired=EXPIRED