Context Navigation

r84d0fbb	rbdd6491
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)
16	16	List<Planner> getPlannersByUser(@Param("username") String username );
	17
	18	@Query(value = "delete from planners_contain WHERE planners_contain.id_location = :locationId", nativeQuery = true)
	19	void deleteLocationFromPlanner(@Param("locationId") Long locationId);
17	20	}

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

r84d0fbb	rbdd6491
76	76	.antMatchers(SIGN_UP_URLS).permitAll()
77	77	.antMatchers(MARIADB_URL).permitAll()
	78	.antMatchers("/api/weekend").permitAll()
	79	.antMatchers("/api/villages").permitAll()
78	80	.anyRequest().authenticated();
79	81	http.addFilterBefore(jwtAuthenticationFilter(), UsernamePasswordAuthenticationFilter.class);

r84d0fbb	rbdd6491
7	7	public static final String TOKEN_PREFIX= "Bearer ";
8	8	public static final String HEADER_STRING = "Authorization";
9		public static final long EXPIRATION_TIME = 3000_000; //30 ~~seconds~~
	9	public static final long EXPIRATION_TIME = 3000_000; //30 min
10	10	}

r84d0fbb	rbdd6491
17	17	Planner editPlannerWithRequestParams(Long id, String description, String name, List<Location> locationList);
18	18	Optional<Planner> newPlanner(PlannerDto plannerDto, String username);
	19	void deletePlannerById(Long id);
	20	void deleteLocationFromPlanner(Long locationId);
19	21	}

r84d0fbb	rbdd6491
183	183	return this.locationRepository.getAllLocationIdsForPlanner(plannerId);
184	184	}
185
186
187	185	}

-              r84d0fbb
+              rbdd6491
 import org.springframework.stereotype.Service;
-import javax.jws.soap.SOAPBinding;
 import java.util.List;
 import java.util.Optional;
 …
     @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);

-              r84d0fbb
+              rbdd6491
 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.*;
 …
         return this.locationService.getAllLocationIdsForPlanner(plannerId);
+    }
+}

-              r84d0fbb
+              rbdd6491
+    }
+    @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());
+    }
+}

r84d0fbb	rbdd6491
92	92	GET http://localhost:8080/api/planners/user
93	93	Content-Type: application/json
	94
	95	###
	96	DELETE http://localhost:8080/api/delete/19
	97	Content-Type: application/json

Note: See TracChangeset for help on using the changeset viewer.