Changeset 6fe77af for trip-planner/src/main

Timestamp:

02/06/22 18:15:51 (3 years ago)

Author:

Ema <ema_spirova@…>

Branches:

master

Children:

571e0df

Parents:

76712b2

Message:

add location feature

Location:

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

Files:

• models/Location.java (modified) (3 diffs)
• models/Period.java (deleted)
• models/User.java (modified) (2 diffs)
• models/dto/LocationDto.java (added)
• models/exceptions/CityNotFoundException.java (added)
• models/exceptions/CompanionNotFoundException.java (added)
• models/exceptions/RegionNotFoundException.java (added)
• security/SecurityConfig.java (modified) (1 diff)
• service/LocationService.java (modified) (2 diffs)
• service/impl/LocationServiceImpl.java (modified) (4 diffs)
• web/rest/LocationRestController.java (modified) (2 diffs)
• web/rest/PlannerRestController.java (modified) (1 diff)

trip-planner/src/main/java/finki/diplomska/tripplanner/models/Location.java

@@ -14 +14 @@
 @Entity
 @Table(name = "locations")
-@NoArgsConstructor
 @AllArgsConstructor
 @Getter
@@ -65 +64 @@
     private List<Planner> plannerList;
 
+    @ManyToOne
+    @JsonBackReference
+    @JoinColumn(name = "id_user")
+    private User user;
 
     @ManyToMany
@@ -74 +77 @@
     private List<Category> categoryList;
 
-
     @OneToMany(mappedBy = "location", cascade = CascadeType.REMOVE, orphanRemoval = true)
     @JsonManagedReference
     private List<Images> imagesList;
 
+    public Location(String name, String description, String address, String priority, int duration, String trivia, byte[] photo, Region region, City city, User user) {
+        this.name = name;
+        this.description = description;
+        this.address = address;
+        this.priority = priority;
+        this.duration = duration;
+        this.trivia = trivia;
+        this.photo = photo;
+        this.region = region;
+        this.city = city;
+        this.user = user;
+    }
 
+    public Location() {
+    }
 }

trip-planner/src/main/java/finki/diplomska/tripplanner/models/User.java

@@ -2 +2 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonManagedReference;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -44 +45 @@
     @JsonIgnore
     private List<Planner> planners = new ArrayList<>();
+
+    @OneToMany(cascade = CascadeType.REFRESH, mappedBy = "user", orphanRemoval = true)
+    @JsonIgnore
+    private List<Location> locationList = new ArrayList<>();;
 
     public User() {

trip-planner/src/main/java/finki/diplomska/tripplanner/security/SecurityConfig.java

@@ -81 +81 @@
                 .antMatchers("/api/all").permitAll()
                 .antMatchers("/api/places").permitAll()
+                .antMatchers("/create/planner").permitAll()
+                .antMatchers("/create/planner/{id}").permitAll()
+                .antMatchers("/create/locations").permitAll()
+                .antMatchers("/create/trip/locations").permitAll()
+                .antMatchers("/create").permitAll()
                 .anyRequest().authenticated();
         http.addFilterBefore(jwtAuthenticationFilter(), UsernamePasswordAuthenticationFilter.class);

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

@@ -4 +4 @@
 import finki.diplomska.tripplanner.models.Location;
 import finki.diplomska.tripplanner.models.Planner;
+import finki.diplomska.tripplanner.models.dto.LocationDto;
 import finki.diplomska.tripplanner.models.dto.PlannerLocationDto;
 import org.springframework.data.repository.query.Param;
@@ -26 +27 @@
     List<Long> getAllLocationIdsForPlanner(Long plannerId);
     List<Location> getAllLocations(String place);
+    Optional<Location> save (LocationDto locationDto, String username);
 }

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

@@ -1 +1 @@
 package finki.diplomska.tripplanner.service.impl;
 
-import finki.diplomska.tripplanner.models.Location;
-import finki.diplomska.tripplanner.models.Planner;
+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.exceptions.LocationNotFoundException;
-import finki.diplomska.tripplanner.repository.jpa.JpaLocationRepository;
-import finki.diplomska.tripplanner.repository.jpa.JpaPlannerRepository;
+import finki.diplomska.tripplanner.models.exceptions.RegionNotFoundException;
+import finki.diplomska.tripplanner.repository.jpa.*;
 import finki.diplomska.tripplanner.service.LocationService;
 import org.springframework.stereotype.Service;
@@ -19 +21 @@
     private final JpaLocationRepository locationRepository;
     private final JpaPlannerRepository plannerRepository;
-
-    public LocationServiceImpl(JpaLocationRepository locationRepository, 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) {
         this.locationRepository = locationRepository;
         this.plannerRepository = plannerRepository;
+        this.regionRepository = regionRepository;
+        this.cityRepository = cityRepository;
+        this.userRepository = userRepository;
+        this.categoryRepository = categoryRepository;
+        this.companionRepository = companionRepository;
     }
 
@@ -151 +163 @@
             }
         }
-
         return newList;
     }
@@ -189 +200 @@
     }
 
+    @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)));
+    }
 
 }

trip-planner/src/main/java/finki/diplomska/tripplanner/web/rest/LocationRestController.java

@@ -2 +2 @@
 
 import finki.diplomska.tripplanner.models.Location;
+import finki.diplomska.tripplanner.models.User;
+import finki.diplomska.tripplanner.models.dto.LocationDto;
 import finki.diplomska.tripplanner.models.dto.PlannerLocationDto;
 import finki.diplomska.tripplanner.service.LocationService;
 import finki.diplomska.tripplanner.service.PlannerService;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.Authentication;
 import org.springframework.web.bind.annotation.*;
 
@@ -82 +85 @@
     }
 
+    @PostMapping("/add")
+    public ResponseEntity<Location> save(@RequestBody LocationDto locationDto, Authentication authentication) {
+        User user = (User) authentication.getPrincipal();
+        return this.locationService.save(locationDto, user.getUsername())
+                .map(location -> ResponseEntity.ok().body(location))
+                .orElseGet(() -> ResponseEntity.badRequest().build());
+    }
 }

trip-planner/src/main/java/finki/diplomska/tripplanner/web/rest/PlannerRestController.java

@@ -69 +69 @@
     @ResponseStatus(HttpStatus.CREATED)
     public ResponseEntity<?> newPlanner(@Valid @RequestBody PlannerDto plannerDto, Authentication authentication)  {
-
         User user = (User) authentication.getPrincipal();
         return this.plannerService.newPlanner(plannerDto, user.getUsername())