Changeset b738035 for trip-planner/src/main/java/finki/diplomska/tripplanner/service

Timestamp:

01/24/22 21:08:32 (3 years ago)

Author:

Ema <ema_spirova@…>

Branches:

master

Children:

76712b2

Parents:

bdd6491

Message:

signup/login server errors on front and remove location from planner

Location:

trip-planner/src/main/java/finki/diplomska/tripplanner/service

Files:

• LocationService.java (modified) (1 diff)
• PlannerService.java (modified) (2 diffs)
• UserService.java (modified) (2 diffs)
• impl/LocationServiceImpl.java (modified) (1 diff)
• impl/PlannerServiceImpl.java (modified) (3 diffs)
• impl/UserServiceImpl.java (modified) (2 diffs)

trip-planner/src/main/java/finki/diplomska/tripplanner/service/LocationService.java

@@ -25 +25 @@
     List<Location> getVillages();
     List<Long> getAllLocationIdsForPlanner(Long plannerId);
+    List<Location> getLocationsForCity(Long cityId);
 }

trip-planner/src/main/java/finki/diplomska/tripplanner/service/PlannerService.java

@@ -4 +4 @@
 import finki.diplomska.tripplanner.models.Planner;
 import finki.diplomska.tripplanner.models.dto.PlannerDto;
+import finki.diplomska.tripplanner.models.dto.PlannerLocationDto;
+import org.springframework.http.ResponseEntity;
 
 import java.util.List;
@@ -18 +20 @@
         Optional<Planner> newPlanner(PlannerDto plannerDto, String username);
         void deletePlannerById(Long id);
-        void deleteLocationFromPlanner(Long locationId);
+        ResponseEntity deleteLocationFromPlanner(PlannerLocationDto plannerLocationDto);
 }

trip-planner/src/main/java/finki/diplomska/tripplanner/service/UserService.java

@@ -4 +4 @@
 import finki.diplomska.tripplanner.models.dto.UserDto;
 
+import java.util.List;
 import java.util.Optional;
 
@@ -10 +11 @@
 
     User saveUser (User user);
-
+    List<String> getAllUsernames();
+    Optional<String> getPassword(UserDto userDto);
+    Optional<User> findById(Long id);
 }

trip-planner/src/main/java/finki/diplomska/tripplanner/service/impl/LocationServiceImpl.java

@@ -183 +183 @@
         return this.locationRepository.getAllLocationIdsForPlanner(plannerId);
     }
+
+    @Override
+    public List<Location> getLocationsForCity(Long cityId) {
+        return this.locationRepository.getLocationsForCity(cityId);
+    }
 }

trip-planner/src/main/java/finki/diplomska/tripplanner/service/impl/PlannerServiceImpl.java

@@ -5 +5 @@
 import finki.diplomska.tripplanner.models.User;
 import finki.diplomska.tripplanner.models.dto.PlannerDto;
+import finki.diplomska.tripplanner.models.dto.PlannerLocationDto;
 import finki.diplomska.tripplanner.models.exceptions.LocationNotFoundException;
 import finki.diplomska.tripplanner.models.exceptions.PlannerNotFoundException;
@@ -11 +12 @@
 import finki.diplomska.tripplanner.repository.jpa.JpaUserRepository;
 import finki.diplomska.tripplanner.service.PlannerService;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 
@@ -67 +69 @@
 
     @Override
-    public void deleteLocationFromPlanner(Long locationId) {
-        this.plannerRepository.deleteLocationFromPlanner(locationId);
+    public ResponseEntity deleteLocationFromPlanner(PlannerLocationDto plannerLocationDto) {
+        plannerRepository.deleteLocationFromPlanner(plannerLocationDto.getPlannerId(), plannerLocationDto.getLocationId());
+        return null;
     }
 

trip-planner/src/main/java/finki/diplomska/tripplanner/service/impl/UserServiceImpl.java

@@ -7 +7 @@
 import finki.diplomska.tripplanner.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.Optional;
 
@@ -34 +36 @@
             throw new UsernameAlreadyExistsException("Username '"+newUser.getUsername()+ "' already exists");
         }
+    }
 
+    @Override
+    public List<String> getAllUsernames() {
+        return this.userRepository.getAllUsernames();
+    }
+
+    @Override
+    public Optional<String> getPassword(UserDto userDto) {
+         this.userRepository.getPassword(userDto.getUsername());
+         return null;
+    }
+
+    @Override
+    public Optional<User> findById(Long id) {
+        return this.userRepository.findById(id);
     }