Merge pull request #369 from ita-social-projects/develop

merge develop to release
ita-social-projects · Jun 30, 2021 · 6f2abaf · 6f2abaf
2 parents d5f9c45 + 6763eba
commit 6f2abaf
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/.github/workflows/rc.yml b/.github/workflows/rc.yml
@@ -44,4 +44,4 @@ jobs:
           email: ${{ secrets.HEROKU_EMAIL }}
           api_key: ${{ secrets.HEROKU_API_KEY }}
           docker_compose_file: '.docker/docker-compose.heroku.yml'
-          heroku_apps: '[{"imagename":"dokazovi","appname":"dokazovi-be","apptype":"web"}]'
+          heroku_apps: '[{"imagename":"dokazovi","appname":"dokazovi-backend","apptype":"web"}]'
diff --git a/src/main/java/com/softserveinc/dokazovi/controller/PostController.java b/src/main/java/com/softserveinc/dokazovi/controller/PostController.java
@@ -122,10 +122,12 @@ public ResponseEntity<Page<PostDTO>> findImportant(
 	}
 
 	@GetMapping(POST_SET_IMPORTANT)
+	@PreAuthorize("hasAuthority('SET_IMPORTANCE')")
 	@ApiPageable
-	@ApiOperation(value = "Set posts as important with order and remove previous order")
+	@ApiOperation(value = "Set posts as important with order and remove previous order",
+			authorizations = {@Authorization(value = "Authorization")})
 	public ResponseEntity<ApiResponseMessage> setPostAsImportant(
-			@ApiParam(value = "Multiple comma-separated posts IDs (new order), e.g. ?origins=1,2,3,4...",
+			@ApiParam(value = "Multiple comma-separated posts IDs (new order), e.g. ?posts=1,2,3,4...",
 					type = "string")
 			@RequestParam(required = true) Set<Integer> posts) {
 		ApiResponseMessage apiResponseMessage;

diff --git a/src/main/java/com/softserveinc/dokazovi/entity/enumerations/RolePermission.java b/src/main/java/com/softserveinc/dokazovi/entity/enumerations/RolePermission.java
@@ -9,7 +9,8 @@ public enum RolePermission implements GrantedAuthority {
 	DELETE_OWN_POST,
 	UPDATE_POST,
 	UPDATE_OWN_POST,
-	SAVE_PUBLICATION;
+	SAVE_PUBLICATION,
+	SET_IMPORTANCE;
 
 	@Override
 	public String getAuthority() {

diff --git a/src/main/resources/db/testdata/V10.2__add_set_importance_permission.sql b/src/main/resources/db/testdata/V10.2__add_set_importance_permission.sql
@@ -0,0 +1,2 @@
+INSERT INTO public.role_permission (role_id, permissions)
+VALUES (1, 'SET_IMPORTANCE');
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		INSERT INTO public.role_permission (role_id, permissions)
		VALUES (1, 'SET_IMPORTANCE');