-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #54 from python-sinhala-education-society/develop
Merge develop to master
- Loading branch information
Showing
10 changed files
with
101 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,10 @@ | ||
| export interface ICommentReply { | ||
| commentID?: string; | ||
| replyBody?: string; | ||
| isAdminReply?: boolean; | ||
| createdBy?: string; | ||
| createdDate?: Date; | ||
| likesCount?: number; | ||
| dislikesCount?: number; | ||
| approved?: boolean; | ||
| } | ||
|
|
||
| export class CommentReply implements ICommentReply { | ||
| constructor( | ||
| commentID?: string, | ||
| replyBody?: string, | ||
| createdBy?: string, | ||
| createdDate?: Date, | ||
| likesCount?: number, | ||
| dislikesCount?: number, | ||
| approved?: boolean | ||
| ) {} | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,14 +2,17 @@ | |
|
|
||
| import com.asanka.tutor.OpenLearnrApp; | ||
| import com.asanka.tutor.domain.Comment; | ||
| import com.asanka.tutor.domain.User; | ||
| import com.asanka.tutor.repository.CommentRepository; | ||
| import com.asanka.tutor.repository.CustomAuditEventRepository; | ||
| import com.asanka.tutor.service.CommentService; | ||
| import com.asanka.tutor.service.UserService; | ||
| import com.asanka.tutor.service.dto.CommentDTO; | ||
| import com.asanka.tutor.service.dto.UserDTO; | ||
| import com.asanka.tutor.service.mapper.CommentMapper; | ||
| import com.asanka.tutor.web.rest.errors.ExceptionTranslator; | ||
|
|
||
| import org.apache.commons.lang3.RandomStringUtils; | ||
| import org.junit.jupiter.api.BeforeEach; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.mockito.MockitoAnnotations; | ||
|
|
@@ -18,6 +21,7 @@ | |
| import org.springframework.data.web.PageableHandlerMethodArgumentResolver; | ||
| import org.springframework.http.MediaType; | ||
| import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; | ||
| import org.springframework.security.test.context.support.WithMockUser; | ||
| import org.springframework.test.web.servlet.MockMvc; | ||
| import org.springframework.test.web.servlet.setup.MockMvcBuilders; | ||
| import org.springframework.validation.Validator; | ||
|
|
@@ -52,6 +56,9 @@ public class CommentResourceIT { | |
| private static final Boolean DEFAULT_IS_APPROVED = false; | ||
| private static final Boolean UPDATED_IS_APPROVED = true; | ||
|
|
||
| private static final Boolean DEFAULT_IS_ADMINCOMMENT = false; | ||
| private static final Boolean UPDATED_IS_ADMINCOMMENT = true; | ||
|
|
||
| @Autowired | ||
| private CommentRepository commentRepository; | ||
|
|
||
|
|
@@ -107,7 +114,8 @@ public static Comment createEntity() { | |
| .commentBody(DEFAULT_COMMENT_BODY) | ||
| .likesCount(DEFAULT_LIKES_COUNT) | ||
| .dislikesCount(DEFAULT_DISLIKES_COUNT) | ||
| .isApproved(DEFAULT_IS_APPROVED); | ||
| .isApproved(DEFAULT_IS_APPROVED) | ||
| .isAdminComment(DEFAULT_IS_ADMINCOMMENT); | ||
| return comment; | ||
| } | ||
| /** | ||
|
|
@@ -122,7 +130,8 @@ public static Comment createUpdatedEntity() { | |
| .commentBody(UPDATED_COMMENT_BODY) | ||
| .likesCount(UPDATED_LIKES_COUNT) | ||
| .dislikesCount(UPDATED_DISLIKES_COUNT) | ||
| .isApproved(UPDATED_IS_APPROVED); | ||
| .isApproved(UPDATED_IS_APPROVED) | ||
| .isAdminComment(UPDATED_IS_ADMINCOMMENT); | ||
| return comment; | ||
| } | ||
|
|
||
|
|
@@ -133,8 +142,14 @@ public void initTest() { | |
| } | ||
|
|
||
| @Test | ||
| @WithMockUser("create-comment") | ||
| public void createComment() throws Exception { | ||
| int databaseSizeBeforeCreate = commentRepository.findAll().size(); | ||
| UserDTO user = new UserDTO(); | ||
| user.setLogin("create-comment"); | ||
| user.setEmail("[email protected]"); | ||
|
|
||
| userService.createUser(user); | ||
|
|
||
| // Create the Comment | ||
| CommentDTO commentDTO = commentMapper.toDto(comment); | ||
|
|
@@ -152,6 +167,7 @@ public void createComment() throws Exception { | |
| assertThat(testComment.getLikesCount()).isEqualTo(DEFAULT_LIKES_COUNT); | ||
| assertThat(testComment.getDislikesCount()).isEqualTo(DEFAULT_DISLIKES_COUNT); | ||
| assertThat(testComment.isIsApproved()).isEqualTo(DEFAULT_IS_APPROVED); | ||
| assertThat(testComment.getIsAdminComment()).isEqualTo(DEFAULT_IS_ADMINCOMMENT); | ||
| } | ||
|
|
||
| @Test | ||
|
|
@@ -242,7 +258,8 @@ public void getAllComments() throws Exception { | |
| .andExpect(jsonPath("$.[*].commentBody").value(hasItem(DEFAULT_COMMENT_BODY))) | ||
| .andExpect(jsonPath("$.[*].likesCount").value(hasItem(DEFAULT_LIKES_COUNT))) | ||
| .andExpect(jsonPath("$.[*].dislikesCount").value(hasItem(DEFAULT_DISLIKES_COUNT))) | ||
| .andExpect(jsonPath("$.[*].isApproved").value(hasItem(DEFAULT_IS_APPROVED))); | ||
| .andExpect(jsonPath("$.[*].isApproved").value(hasItem(DEFAULT_IS_APPROVED))) | ||
| .andExpect(jsonPath("$.[*].isAdminComment").value(hasItem(DEFAULT_IS_ADMINCOMMENT))); | ||
| } | ||
|
|
||
| @Test | ||
|
|
@@ -259,7 +276,8 @@ public void getComment() throws Exception { | |
| .andExpect(jsonPath("$.commentBody").value(DEFAULT_COMMENT_BODY)) | ||
| .andExpect(jsonPath("$.likesCount").value(DEFAULT_LIKES_COUNT)) | ||
| .andExpect(jsonPath("$.dislikesCount").value(DEFAULT_DISLIKES_COUNT)) | ||
| .andExpect(jsonPath("$.isApproved").value(DEFAULT_IS_APPROVED)); | ||
| .andExpect(jsonPath("$.isApproved").value(DEFAULT_IS_APPROVED)) | ||
| .andExpect(jsonPath("$.isAdminComment").value(DEFAULT_IS_ADMINCOMMENT)); | ||
| } | ||
|
|
||
| @Test | ||
|
|
@@ -283,7 +301,8 @@ public void updateComment() throws Exception { | |
| .commentBody(UPDATED_COMMENT_BODY) | ||
| .likesCount(UPDATED_LIKES_COUNT) | ||
| .dislikesCount(UPDATED_DISLIKES_COUNT) | ||
| .isApproved(UPDATED_IS_APPROVED); | ||
| .isApproved(UPDATED_IS_APPROVED) | ||
| .isAdminComment(UPDATED_IS_ADMINCOMMENT); | ||
| CommentDTO commentDTO = commentMapper.toDto(updatedComment); | ||
|
|
||
| restCommentMockMvc.perform(put("/api/comments") | ||
|
|
@@ -300,6 +319,7 @@ public void updateComment() throws Exception { | |
| assertThat(testComment.getLikesCount()).isEqualTo(UPDATED_LIKES_COUNT); | ||
| assertThat(testComment.getDislikesCount()).isEqualTo(UPDATED_DISLIKES_COUNT); | ||
| assertThat(testComment.isIsApproved()).isEqualTo(UPDATED_IS_APPROVED); | ||
| assertThat(testComment.getIsAdminComment()).isEqualTo(UPDATED_IS_ADMINCOMMENT); | ||
| } | ||
|
|
||
| @Test | ||
|
|
||