Index: trip-planner/src/main/java/finki/diplomska/tripplanner/service/impl/LocationServiceImpl.java
===================================================================
--- trip-planner/src/main/java/finki/diplomska/tripplanner/service/impl/LocationServiceImpl.java	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ trip-planner/src/main/java/finki/diplomska/tripplanner/service/impl/LocationServiceImpl.java	(revision 6a3a178323fd905112b5392bd9d3cb83b66ef2d3)
@@ -1,17 +1,11 @@
 package finki.diplomska.tripplanner.service.impl;
 
-import finki.diplomska.tripplanner.models.*;
-import finki.diplomska.tripplanner.models.dto.LocationDto;
-import finki.diplomska.tripplanner.models.dto.PlannerLocationDto;
-import finki.diplomska.tripplanner.models.exceptions.CityNotFoundException;
-import finki.diplomska.tripplanner.models.exceptions.CompanionNotFoundException;
+import finki.diplomska.tripplanner.models.Location;
 import finki.diplomska.tripplanner.models.exceptions.LocationNotFoundException;
-import finki.diplomska.tripplanner.models.exceptions.RegionNotFoundException;
-import finki.diplomska.tripplanner.repository.jpa.*;
+import finki.diplomska.tripplanner.repository.jpa.JpaLocationRepository;
 import finki.diplomska.tripplanner.service.LocationService;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
-import java.util.stream.Collectors;
 
 
@@ -20,19 +14,7 @@
 
     private final JpaLocationRepository locationRepository;
-    private final JpaPlannerRepository plannerRepository;
-    private final JpaRegionRepository regionRepository;
-    private final JpaCityRepository cityRepository;
-    private final JpaUserRepository userRepository;
-    private final JpaCategoryRepository categoryRepository;
-    private final JpaCompanionRepository companionRepository;
 
-    public LocationServiceImpl(JpaLocationRepository locationRepository, JpaPlannerRepository plannerRepository, JpaRegionRepository regionRepository, JpaCityRepository cityRepository, JpaUserRepository userRepository, JpaCategoryRepository categoryRepository, JpaCompanionRepository companionRepository) {
+    public LocationServiceImpl(JpaLocationRepository locationRepository) {
         this.locationRepository = locationRepository;
-        this.plannerRepository = plannerRepository;
-        this.regionRepository = regionRepository;
-        this.cityRepository = cityRepository;
-        this.userRepository = userRepository;
-        this.categoryRepository = categoryRepository;
-        this.companionRepository = companionRepository;
     }
 
@@ -65,64 +47,4 @@
         return this.locationRepository.findById(id);
     }
-
-    @Override
-    public List<Location> findLocationsFromCityForm(Long cityId, Long companionId, Long lengthOfStay, String categoryIds) {
-        List<Long> categories = null;
-        if(categoryIds != null && !categoryIds.isEmpty()){
-            List<String> ids = Arrays.asList(categoryIds.split(","));
-            categories = ids.stream().map(Long::valueOf).collect(Collectors.toList());
-        }
-        Long maxMinutesPerDay = lengthOfStay *6 * 60;
-        int minutesPerDay = 0;
-        List<Location> citylocations = this.locationRepository.findLocationsFromCityForm(cityId, companionId, categories);
-        List<Location> newList = new ArrayList<>();
-        int listSize = citylocations.size();
-
-        while(minutesPerDay < maxMinutesPerDay ){
-            for(Location l: citylocations) {
-                if (minutesPerDay < maxMinutesPerDay && l.getDuration() + minutesPerDay <= maxMinutesPerDay && listSize != 0) {
-                    newList.add(l);
-                    listSize --;
-                }
-                minutesPerDay += l.getDuration();
-                if (minutesPerDay > maxMinutesPerDay) {
-                    break;
-                }
-            }
-        }
-
-        List<Location> foundLocations = locationRepository.findLocationsFromCityForm(cityId, companionId, categories);
-        return newList;
-    }
-
-    @Override
-    public List<Location> findLocationsFromRegionForm(Long regionId, Long companionId, Long lengthOfStay, String categoryIds) {
-        List<Long> categories = null;
-        if(categoryIds != null && !categoryIds.isEmpty()){
-            List<String> ids = Arrays.asList(categoryIds.split(","));
-            categories = ids.stream().map(Long::valueOf).collect(Collectors.toList());
-        }
-        Long maxMinutesPerDay = lengthOfStay *6 * 60;
-        int minutesPerDay = 0;
-        List<Location> countryLocations = this.locationRepository.findLocationsFromRegionForm(regionId, companionId, categories);
-        List<Location> newList = new ArrayList<>();
-        int listCountrySize = countryLocations.size();
-
-            while(minutesPerDay < maxMinutesPerDay){
-                for(Location l: countryLocations) {
-                    if (minutesPerDay < maxMinutesPerDay && l.getDuration() + minutesPerDay <= maxMinutesPerDay && listCountrySize != 0) {
-                        newList.add(l);
-                        listCountrySize --;
-                    }
-                    minutesPerDay += l.getDuration();
-                    if (minutesPerDay > maxMinutesPerDay) {
-                        break;
-                    }
-                }
-
-        }
-        return newList;
-    }
-
 
     @Override
@@ -163,57 +85,7 @@
             }
         }
+
         return newList;
     }
 
-    @Override
-    public Location addLocationToPlanner(PlannerLocationDto plannerLocationDto) {
-        Location location = this.locationRepository.findById(plannerLocationDto.getLocationId())
-                .orElseThrow(() -> new LocationNotFoundException(plannerLocationDto.getLocationId()));
-        Planner planner = this.plannerRepository.getById(plannerLocationDto.getPlannerId());
-        planner.getLocationList().add(location);
-        return this.locationRepository.save(location);
-    }
-
-    @Override
-    public List<Location> getAllLocationsForPlanner(Long plannerId) {
-        return this.locationRepository.getAllLocationsForPlanner(plannerId);
-    }
-
-    @Override
-    public List<Location> getWeekendGetaways() {
-        return this.locationRepository.getWeekendGetaways();
-    }
-
-    @Override
-    public List<Location> getVillages() {
-        return this.locationRepository.getVillages();
-    }
-
-    @Override
-    public List<Long> getAllLocationIdsForPlanner(Long plannerId) {
-        return this.locationRepository.getAllLocationIdsForPlanner(plannerId);
-    }
-
-    @Override
-    public List<Location> getAllLocations(String place) {
-        return this.locationRepository.getAllLocations(place);
-    }
-
-    @Override
-    public Optional<Location> save(LocationDto locationDto, String username) {
-        City city = new City();
-        Region region = this.regionRepository.findById(locationDto.getRegion())
-                .orElseThrow(() -> new RegionNotFoundException(locationDto.getRegion()));
-        if(locationDto.getCity() != null){
-             city = this.cityRepository.findById(locationDto.getCity())
-                    .orElseThrow(() -> new CityNotFoundException(locationDto.getCity()));
-        }else{
-            city = null;
-        }
-        User user = this.userRepository.findByUsername(username);
-        locationDto.setUser(user.getUsername());
-        return Optional.of(this.locationRepository.save(new Location(locationDto.getName(), locationDto.getDescription(), locationDto.getAddress(), locationDto.getPriority(),
-                locationDto.getDuration(), locationDto.getTrivia(), locationDto.getPhoto(), region, city, user)));
-    }
-
 }
