This is the codeAbility Sharing Platform! Learn more about the codeAbility Sharing Platform.

Skip to content
Snippets Groups Projects
Commit 354ac138 authored by Eduard Frankford's avatar Eduard Frankford
Browse files

refactored api to be more conform to the naming standards

parent 9eae70a7
2 merge requests!62created achievementService and separated some functionality out of...,!58Resolves #162 and #171
......@@ -166,9 +166,8 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
.antMatchers("/api/activate").permitAll()
.antMatchers("/api/account/reset-password/init").permitAll()
.antMatchers("/api/account/reset-password/finish").permitAll()
.antMatchers("/api/numberOfLikes/**").permitAll()
.antMatchers("/api/user/likes/hasLiked/**").permitAll()
.antMatchers("/api/user/likes/**").permitAll()
.antMatchers("/api/likes/numberOfLikes/**").permitAll()
.antMatchers("/api/likes/hasLiked/**").permitAll()
.antMatchers("/api/**").authenticated()
.antMatchers("/management/health").permitAll()
.antMatchers("/management/info").permitAll()
......
......@@ -105,7 +105,7 @@ public class LikesResource {
.body(result);
}
@PutMapping("/likeExercise")
@PutMapping("/likes/likeExercise")
public ResponseEntity<Likes> updateLikeWithexerciseID(@RequestBody Likes likes) {
if (likes.getExerciseID() != null && searchService.hasAccessToExerciseId(likes.getExerciseID())) {
......@@ -141,7 +141,7 @@ public class LikesResource {
// }
@DeleteMapping("/user/likes/**")
@DeleteMapping("/likes/unlikeExercise/**")
public ResponseEntity<Void> deleteLikeWithexerciseID(HttpServletRequest request) {
......@@ -157,7 +157,7 @@ public class LikesResource {
}
@GetMapping("/numberOfLikes/**")
@GetMapping("/likes/numberOfLikes/**")
public ResponseEntity<Integer> getNumberOfLikesForExerciseID(HttpServletRequest request) {
String pattern = (String) request.getAttribute(HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE);
......@@ -169,7 +169,7 @@ public class LikesResource {
return ResponseEntity.ok().body(n);
}
@GetMapping("/user/likes/hasLiked/**")
@GetMapping("/likes/hasLiked/**")
public ResponseEntity<Boolean> hasLikedProject(HttpServletRequest request) {
String pattern = (String) request.getAttribute(HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE);
......
......@@ -60,19 +60,19 @@ export class LikesService {
likeExercise(exerciseID: string): Observable<EntityResponseType> {
const like = new Likes();
like.exerciseID = exerciseID;
return this.http.put<ILikes>(SERVER_API_URL + 'api/likeExercise', like, { observe: 'response' });
return this.http.put<ILikes>(SERVER_API_URL + 'api/likes/likeExercise', like, { observe: 'response' });
}
unlikeExercise(exerciseID: string): Observable<HttpResponse<{}>> {
return this.http.delete(SERVER_API_URL + 'api/user/likes/' + exerciseID, { observe: 'response' });
return this.http.delete(SERVER_API_URL + 'api/likes/unlikeExercise/' + exerciseID, { observe: 'response' });
}
getLikesForexerciseID(exerciseID: string): Observable<number> {
return this.http.get<number>(SERVER_API_URL + 'api/numberOfLikes/' + exerciseID);
return this.http.get<number>(SERVER_API_URL + 'api/likes/numberOfLikes/' + exerciseID);
}
hasLiked(exerciseID: string): Observable<boolean> {
return this.http.get<boolean>(SERVER_API_URL + 'api/user/likes/hasLiked/' + exerciseID);
return this.http.get<boolean>(SERVER_API_URL + 'api/likes/hasLiked/' + exerciseID);
}
protected convertDateFromClient(likes: ILikes): ILikes {
......
......@@ -236,7 +236,7 @@ public class LikesResourceIT {
likesRepository.saveAndFlush(likes);
// Get the likes
restLikesMockMvc.perform(get("/api/numberOfLikes/", likes.getExerciseID())).andExpect(status().isOk());
restLikesMockMvc.perform(get("/api/likes/numberOfLikes/{exerciseID}", likes.getExerciseID())).andExpect(status().isOk());
assertEquals(1, likesRepository.findNumberOfLikesByExerciseID(likes.getExerciseID()));
}
......@@ -253,24 +253,24 @@ public class LikesResourceIT {
//user likes a project
restLikesMockMvc.perform(put("/api/likeExercise").with(csrf().asHeader()).contentType(MediaType.APPLICATION_JSON)
restLikesMockMvc.perform(put("/api/likes/likeExercise").with(csrf().asHeader()).contentType(MediaType.APPLICATION_JSON)
.content(TestUtil.convertObjectToJsonBytes(newLike))).andExpect(status().isOk());
assertEquals(1, likesRepository.findNumberOfLikesByExerciseID("1000/abc/bd"));
//like again and nothing should happen
restLikesMockMvc.perform(put("/api/likeExercise").with(csrf().asHeader()).contentType(MediaType.APPLICATION_JSON)
restLikesMockMvc.perform(put("/api/likes/likeExercise").with(csrf().asHeader()).contentType(MediaType.APPLICATION_JSON)
.content(TestUtil.convertObjectToJsonBytes(newLike))).andExpect(status().isOk());
restLikesMockMvc.perform(get("/api/numberOfLikes/{exerciseID}", "1000/abc/bd").with(csrf().asHeader()).contentType(MediaType.APPLICATION_JSON)).andExpect(status().isOk());
restLikesMockMvc.perform(get("/api/likes/numberOfLikes/{exerciseID}", "1000/abc/bd").with(csrf().asHeader()).contentType(MediaType.APPLICATION_JSON)).andExpect(status().isOk());
assertEquals(1, likesRepository.findNumberOfLikesByExerciseID("1000/abc/bd"));
//unlike project
restLikesMockMvc.perform(delete("/api/user/likes/{exerciseID}", "1000/abc/bd").with(csrf().asHeader()).accept(MediaType.APPLICATION_JSON))
restLikesMockMvc.perform(delete("/api/likes/unlikeExercise/{exerciseID}", "1000/abc/bd").with(csrf().asHeader()).accept(MediaType.APPLICATION_JSON))
.andExpect(status().isNoContent());
assertEquals(0, likesRepository.findNumberOfLikesByExerciseID("1000/abc/bd"));
......@@ -289,7 +289,7 @@ public class LikesResourceIT {
//user likes a project and nothing should happen
restLikesMockMvc.perform(put("/api/likeExercise").contentType(MediaType.APPLICATION_JSON)
restLikesMockMvc.perform(put("/api/likes/likeExercise").contentType(MediaType.APPLICATION_JSON)
.content(TestUtil.convertObjectToJsonBytes(newLike))).andExpect(status().isForbidden());
assertEquals(0, likesRepository.findNumberOfLikesByExerciseID("1000"));
......@@ -297,7 +297,7 @@ public class LikesResourceIT {
//unlike project
restLikesMockMvc.perform(delete("/api/user/likes/{exerciseID}", "1000").accept(MediaType.APPLICATION_JSON))
restLikesMockMvc.perform(delete("/api/likes/unlikeExercise/{exerciseID}", "1000").accept(MediaType.APPLICATION_JSON))
.andExpect(status().isForbidden());
assertEquals(0, likesRepository.findNumberOfLikesByExerciseID("1000"));
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment