Skip to content
Merged
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
@@ -1,4 +1,5 @@
package cat.udl.eps.softarch.demo.config;

import cat.udl.eps.softarch.demo.domain.Admin;
import cat.udl.eps.softarch.demo.domain.Business;
import cat.udl.eps.softarch.demo.domain.User;
Expand All @@ -21,7 +22,8 @@ public class DBInitialization {
private final AdminRepository adminRepository;
private final BusinessRepository businessRepository;

public DBInitialization(UserRepository userRepository, AdminRepository adminRepository, BusinessRepository businessRepository) {
public DBInitialization(UserRepository userRepository, AdminRepository adminRepository,
BusinessRepository businessRepository) {
this.userRepository = userRepository;
this.adminRepository = adminRepository;
this.businessRepository = businessRepository;
Expand Down Expand Up @@ -58,6 +60,46 @@ public void initializeDatabase() {
business.encodePassword();
business.setName("Best Coffee Shop");
business.setAddress("Main Street 123");
business.setOpeningTime(java.time.LocalTime.of(8, 0));
business.setClosingTime(java.time.LocalTime.of(20, 0));
business.setRating(4.5);
business.setCapacity(50);
business.setHasWifi(true);
business.setStatus(cat.udl.eps.softarch.demo.domain.BusinessStatus.ACCEPTED);
businessRepository.save(business);
}

if (!businessRepository.existsById("coffee_lover")) {
Business business = new Business();
business.setId("coffee_lover");
business.setEmail("lover@coffee.com");
business.setPassword(defaultPassword);
business.encodePassword();
business.setName("Coffee Lovers");
business.setAddress("Second Avenue 45");
business.setOpeningTime(java.time.LocalTime.of(9, 0));
business.setClosingTime(java.time.LocalTime.of(21, 0));
business.setRating(4.8);
business.setCapacity(30);
business.setHasWifi(true);
business.setStatus(cat.udl.eps.softarch.demo.domain.BusinessStatus.ACCEPTED);
businessRepository.save(business);
}

if (!businessRepository.existsById("night_owl")) {
Business business = new Business();
business.setId("night_owl");
business.setEmail("night@coffee.com");
business.setPassword(defaultPassword);
business.encodePassword();
business.setName("Night Owl Cafe");
business.setAddress("Midnight Lane 66");
business.setOpeningTime(java.time.LocalTime.of(18, 0));
business.setClosingTime(java.time.LocalTime.of(2, 0));
business.setRating(4.2);
business.setCapacity(20);
business.setHasWifi(false);
business.setStatus(cat.udl.eps.softarch.demo.domain.BusinessStatus.ACCEPTED);
businessRepository.save(business);
}
if (Arrays.asList(activeProfiles.split(",")).contains("test")) {
Expand Down
15 changes: 15 additions & 0 deletions src/main/java/cat/udl/eps/softarch/demo/domain/Business.java
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ public class Business extends User {
private LocalTime openingTime;
private LocalTime closingTime;
@Enumerated(EnumType.STRING)
@JsonProperty("registrationStatus")
private BusinessStatus status;
private String imageUrl;

Expand All @@ -43,4 +44,18 @@ public class Business extends User {
public Collection<? extends GrantedAuthority> getAuthorities() {
return AuthorityUtils.commaSeparatedStringToAuthorityList("ROLE_BUSINESS");
}

@JsonProperty("ownerId")
public String getOwnerId() {
return this.getId();
}

@JsonProperty("status")
public String getOpenStatus() {
if (openingTime == null || closingTime == null) {
return "Closed";
}
LocalTime now = LocalTime.now();
return (now.isAfter(openingTime) && now.isBefore(closingTime)) ? "Open" : "Closed";
}
}