Changeset f25d07e for phonelux-backend/src/main/java/finki/it/phoneluxbackend/services

Timestamp:

09/07/22 00:51:50 (22 months ago)

Author:

Marko <Marko@…>

Branches:

master

Children:

527b93f

Parents:

dbd4834

Message:

Edited registration and login services

Location:

phonelux-backend/src/main/java/finki/it/phoneluxbackend/services

Files:

• PhoneOfferService.java (modified) (2 diffs)
• PhoneService.java (modified) (2 diffs)
• RegistrationService.java (modified) (5 diffs)
• UserService.java (modified) (5 diffs)

phonelux-backend/src/main/java/finki/it/phoneluxbackend/services/PhoneOfferService.java

@@ -7 +7 @@
 
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
@@ -24 +26 @@
             throw new IllegalStateException("Phone with id "+phoneId+" does not exist");
 
-        return phoneRepository.findById(phoneId).get().getPhoneOffers();
+        return phoneRepository.findById(phoneId).get().getPhoneOffers()
+                .stream().sorted(Comparator.comparing(PhoneOffer::getPrice)).collect(Collectors.toList());
     }
+
+    public List<String> getShops() {
+        return phoneOfferRepository.findAll().stream()
+                .map(PhoneOffer::getOffer_shop)
+                .distinct()
+                .collect(Collectors.toList());
+    }
+
+
+    public int getLowestPrice() {
+        return phoneOfferRepository.findAll()
+                .stream().sorted(Comparator.comparing(PhoneOffer::getPrice))
+                .collect(Collectors.toList()).get(0).getPrice();
+    }
+
+    public int getHighestPrice() {
+        return phoneOfferRepository.findAll()
+                .stream().sorted(Comparator.comparing(PhoneOffer::getPrice).reversed())
+                .collect(Collectors.toList()).get(0).getPrice();
+    }
+
 }

phonelux-backend/src/main/java/finki/it/phoneluxbackend/services/PhoneService.java

@@ -4 +4 @@
 import finki.it.phoneluxbackend.entities.PhoneOffer;
 import finki.it.phoneluxbackend.repositories.PhoneRepository;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 
+import java.util.Comparator;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
@@ -17 +20 @@
     }
 
+
+    // TODO: insert logic to filter
     public List<Phone> getPhones(){
         return phoneRepository.findAll();
     }
 
+    public List<String> getBrands(){
+        return phoneRepository.findAll().stream()
+                .map(Phone::getBrand).distinct()
+                .collect(Collectors.toList());
+    }
+
+    public Phone getPhoneById(Long phoneId) {
+        boolean exists = phoneRepository.existsById(phoneId);
+        if(!exists)
+            throw new IllegalStateException("Phone with id "+phoneId+" does not exist");
+        return phoneRepository.findById(phoneId).get();
+    }
 }

phonelux-backend/src/main/java/finki/it/phoneluxbackend/services/RegistrationService.java

@@ -1 +1 @@
 package finki.it.phoneluxbackend.services;
 
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.io.JsonStringEncoder;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.util.JSONPObject;
 import finki.it.phoneluxbackend.data.RegistrationRequest;
 import finki.it.phoneluxbackend.data.UserRole;
@@ -8 +12 @@
 import finki.it.phoneluxbackend.security.email.EmailValidator;
 import lombok.AllArgsConstructor;
+import org.apache.coyote.Response;
+import org.apache.tomcat.util.json.JSONParser;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
+import java.util.HashMap;
 
 @Service
@@ -22 +31 @@
 
 
-    public String register(RegistrationRequest request) {
+    public ResponseEntity<Object> register(RegistrationRequest request) {
         boolean isValidEmail = emailValidator.test(request.getEmail());
 
-        // validacija za mejl na frontend ?
+        // mail is validated on frontend already
         if (!isValidEmail)
             throw new IllegalStateException("Email"+request.getEmail()+" not valid!");
 
-        String token = userService.signUpUser(
+        ResponseEntity response = userService.signUpUser(
                 new User(request.getFirstName(),
                         request.getLastName(),
@@ -36 +45 @@
                         UserRole.USER));
 
-        String link = "http://localhost:8080/registration/confirm?token="+token;
+        if (response.getStatusCode() == HttpStatus.BAD_REQUEST)
+        {
+            return response;
+        }
+
+        String link = "http://localhost:8080/registration/confirm?token="+response.getBody()
+                .toString().split(":")[1];
         emailSender.send(request.getEmail(), buildEmail(request.getFirstName(),link));
-        return token;
+
+        return response;
     }
 
@@ -113 +129 @@
     @Transactional
     public String confirmToken(String token) {
-        ConfirmationToken confirmationToken = confirmationTokenService.getToken(token)
-                .orElseThrow(() -> new IllegalStateException("Token not found!"));
+        boolean confirmationTokenExists = confirmationTokenService.getToken(token).isPresent();
+
+        ConfirmationToken confirmationToken;
+
+        if(confirmationTokenExists)
+            confirmationToken = confirmationTokenService.getToken(token).get();
+        else
+            return "Token not found!";
 
         if(confirmationToken.getConfirmedAt() != null)
-            throw new IllegalStateException("Email already confirmed!");
+            return "Email already confirmed!";
 
         LocalDateTime expiresAt = confirmationToken.getExpiresAt();
 
         if (expiresAt.isBefore(LocalDateTime.now())){
-            throw new IllegalStateException("Token expired");
+            return "Token expired";
         }
 

phonelux-backend/src/main/java/finki/it/phoneluxbackend/services/UserService.java

@@ -1 +1 @@
 package finki.it.phoneluxbackend.services;
+
 
 import finki.it.phoneluxbackend.entities.User;
@@ -5 +6 @@
 import finki.it.phoneluxbackend.entities.ConfirmationToken;
 import lombok.AllArgsConstructor;
+
+import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
@@ -12 +15 @@
 
 import java.time.LocalDateTime;
+
 import java.util.UUID;
 
@@ -28 +32 @@
     }
 
-    public String signUpUser(User user)
+    public ResponseEntity<Object> signUpUser(User user)
     {
-       boolean userExists =  userRepository.findByEmail(user.getEmail()).isPresent();
+       boolean userExists = userRepository.findByEmail(user.getEmail()).isPresent();
 
-       if (userExists && user.getEnabled()){
-           throw new IllegalStateException("Email "+user.getEmail()+" already taken!");
+
+       if (userExists){
+           User userToRegister =  userRepository.findByEmail(user.getEmail()).get();
+           if(userToRegister.getEnabled()) {
+               return ResponseEntity.badRequest().body("Error: Email "+user.getEmail()+" already taken!");
+           }
+           else {
+               return ResponseEntity.badRequest().body("Email "+user.getEmail()+" not activated!" );
+           }
        }
 
@@ -49 +60 @@
         confirmationTokenService.saveConfirmationToken(confirmationToken);
 
-        return token;
+        return ResponseEntity.ok().body("token:"+token);
     }