Changeset bdd6491 for trip-planner/src/main/java/finki/diplomska

Timestamp:

12/28/21 08:56:55 (3 years ago)

Author:

Ema <ema_spirova@…>

Branches:

master

Children:

b738035

Parents:

84d0fbb

Message:

pre final presentation

Location:

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

Files:

• TripPlannerApplication.java (modified) (1 diff)
• models/Location.java (modified) (1 diff)
• models/Planner.java (modified) (1 diff)
• repository/jpa/JpaLocationRepository.java (modified) (1 diff)
• repository/jpa/JpaPlannerRepository.java (modified) (1 diff)
• security/SecurityConfig.java (modified) (1 diff)
• security/SecurityConstants.java (modified) (1 diff)
• service/PlannerService.java (modified) (1 diff)
• service/impl/LocationServiceImpl.java (modified) (1 diff)
• service/impl/PlannerServiceImpl.java (modified) (2 diffs)
• web/rest/LocationRestController.java (modified) (2 diffs)
• web/rest/PlannerRestController.java (modified) (1 diff)

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

@@ -21 +21 @@
     }
 
-
     public static void main(String[] args) {
         SpringApplication.run(TripPlannerApplication.class, args);

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

@@ -35 +35 @@
 
     private int duration;
+
+    private String trivia;
 
     @Lob

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

@@ -26 +26 @@
     private String description;
 
-    @ManyToMany
+    @ManyToMany()
     @JoinTable(
             name = "planners_contain",

trip-planner/src/main/java/finki/diplomska/tripplanner/repository/jpa/JpaLocationRepository.java

@@ -108 +108 @@
             "WHERE lb.id_category=4", nativeQuery = true)
     List<Location> getVillages();
+
 }

trip-planner/src/main/java/finki/diplomska/tripplanner/repository/jpa/JpaPlannerRepository.java

@@ -15 +15 @@
         @Query(value = "SELECT * FROM planners AS p left JOIN users AS u ON p.user_id = u.id WHERE u.username like :username", nativeQuery = true)
         List<Planner> getPlannersByUser(@Param("username") String username );
+
+        @Query(value = "delete from planners_contain WHERE planners_contain.id_location = :locationId", nativeQuery = true)
+        void deleteLocationFromPlanner(@Param("locationId") Long locationId);
 }

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

@@ -76 +76 @@
                 .antMatchers(SIGN_UP_URLS).permitAll()
                 .antMatchers(MARIADB_URL).permitAll()
+                .antMatchers("/api/weekend").permitAll()
+                .antMatchers("/api/villages").permitAll()
                 .anyRequest().authenticated();
         http.addFilterBefore(jwtAuthenticationFilter(), UsernamePasswordAuthenticationFilter.class);

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

@@ -7 +7 @@
     public static final String TOKEN_PREFIX= "Bearer ";
     public static final String HEADER_STRING = "Authorization";
-    public static final long EXPIRATION_TIME = 3000_000; //30 seconds
+    public static final long EXPIRATION_TIME = 3000_000; //30 min
 }

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

@@ -17 +17 @@
         Planner editPlannerWithRequestParams(Long id, String description, String name, List<Location> locationList);
         Optional<Planner> newPlanner(PlannerDto plannerDto, String username);
+        void deletePlannerById(Long id);
+        void deleteLocationFromPlanner(Long locationId);
 }

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

@@ -183 +183 @@
         return this.locationRepository.getAllLocationIdsForPlanner(plannerId);
     }
-
-
 }

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

@@ -13 +13 @@
 import org.springframework.stereotype.Service;
 
-import javax.jws.soap.SOAPBinding;
 import java.util.List;
 import java.util.Optional;
@@ -63 +62 @@
 
     @Override
+    public void deletePlannerById(Long id) {
+        this.plannerRepository.deleteById(id);
+    }
+
+    @Override
+    public void deleteLocationFromPlanner(Long locationId) {
+        this.plannerRepository.deleteLocationFromPlanner(locationId);
+    }
+
+    @Override
     public Planner createPlannerWithRequestParams(String plandesc,String planname, List<Location> locationList) {
         Planner planner = Planner.createNewPlanner(plandesc, planname, locationList);

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

@@ -5 +5 @@
 import finki.diplomska.tripplanner.service.LocationService;
 import finki.diplomska.tripplanner.service.PlannerService;
-import org.springframework.data.repository.query.Param;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -77 +76 @@
         return this.locationService.getAllLocationIdsForPlanner(plannerId);
     }
+
 }

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

@@ -84 +84 @@
     }
 
+    @DeleteMapping("/delete/{id}")
+    public ResponseEntity deleteById(@PathVariable Long id) {
+        this.plannerService.deletePlannerById(id);
+        return this.plannerService.findById(id)
+                .map(planner -> ResponseEntity.ok().body(planner))
+                .orElseGet(()-> ResponseEntity.notFound().build());
+    }
 
+
+    @DeleteMapping(value = "/delete-from-planner")
+    public ResponseEntity deleteLocationFromPlanner(@PathVariable Long locationId){
+        this.plannerService.deleteLocationFromPlanner(locationId);
+        return this.locationService.findById(locationId)
+                .map(location -> ResponseEntity.ok().body(location))
+                .orElseGet(()-> ResponseEntity.notFound().build());
+    }
 }