Bt 21 bp

bugtracker/src/main/java/bugtracker/SecurityConfig.java

@@ -42,6 +42,7 @@ protected void configure(HttpSecurity httpSecurity) throws Exception {
 			.antMatchers("/api/user/current/**").permitAll()
 			.antMatchers("/api/**").access("hasRole('ROLE_USER') or hasRole('ROLE_ADMIN') or hasRole('ROLE_DEVELOPER') or hasRole('ROLE_APPROVER')")
 			.antMatchers("/ticket/**").access("hasRole('ROLE_USER') or hasRole('ROLE_ADMIN') or hasRole('ROLE_DEVELOPER') or hasRole('ROLE_APPROVER')")
+			.antMatchers("/comment/**").access("hasRole('ROLE_USER') or hasRole('ROLE_ADMIN') or hasRole('ROLE_DEVELOPER') or hasRole('ROLE_APPROVER')")
 		.and()
 		.csrf().disable()
 			.formLogin()

bugtracker/src/main/java/bugtracker/comment/CommentController.java

@@ -0,0 +1,39 @@
+package bugtracker.comment;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import javax.inject.Inject;
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/comment")
+public class CommentController {
+
+    @Inject
+    CommentService commentService;
+
+    @RequestMapping(
+            value = "/create",
+            method = RequestMethod.POST,
+            consumes = MediaType.APPLICATION_JSON_VALUE,
+            produces = MediaType.APPLICATION_JSON_VALUE
+    )
+    @ResponseBody()
+    public ResponseEntity addNewComment(@RequestBody CommentEntity commentEntity) {
+        try {
+            commentService.createComment(commentEntity);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
+        }
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+    @GetMapping("/all/{ticketId}")
+    public ResponseEntity<List<CommentEntity>> getAllByTicketID(@PathVariable Long ticketId) {
+        return new ResponseEntity<>(commentService.getAllByTicketId(ticketId), HttpStatus.OK);
+    }
+}

bugtracker/src/main/java/bugtracker/comment/CommentEntity.java

@@ -0,0 +1,70 @@
+package bugtracker.comment;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.time.LocalDateTime;
+
+@Entity
+@Table(name = "KOMMENT")
+public class CommentEntity {
+    @Id
+    @GeneratedValue
+    private long id;
+
+    private long ticketId;
+    private long userId;
+
+    private String commentText;
+    private String userName;
+    private LocalDateTime commentTime;
+
+    public long getId() {
+        return id;
+    }
+
+    public long getTicketId() {
+        return ticketId;
+    }
+
+    public long getUserId() {
+        return userId;
+    }
+
+    public String getCommentText() {
+        return commentText;
+    }
+
+    public LocalDateTime getCommentTime() {
+        return commentTime;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public void setTicketId(long ticketId) {
+        this.ticketId = ticketId;
+    }
+
+    public void setUserId(long userId) {
+        this.userId = userId;
+    }
+
+    public void setCommentText(String commentText) {
+        this.commentText = commentText;
+    }
+
+    public void setCommentTime(LocalDateTime commentTime) {
+        this.commentTime = commentTime;
+    }
+}

bugtracker/src/main/java/bugtracker/comment/CommentRepository.java

@@ -0,0 +1,9 @@
+package bugtracker.comment;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.List;
+
+public interface CommentRepository extends JpaRepository<CommentEntity, Long> {
+    List<CommentEntity> findAllByTicketId(Long ticketId);
+}

bugtracker/src/main/java/bugtracker/comment/CommentService.java

@@ -0,0 +1,21 @@
+package bugtracker.comment;
+
+import org.springframework.stereotype.Service;
+
+import javax.inject.Inject;
+import java.util.List;
+
+@Service
+public class CommentService {
+
+    @Inject
+    CommentRepository commentRepository;
+
+    public CommentEntity createComment(CommentEntity commentEntity) {
+        return commentRepository.save(commentEntity);
+    }
+
+    public List<CommentEntity> getAllByTicketId(Long ticketId) {
+        return commentRepository.findAllByTicketId(ticketId);
+    }
+}

bugtracker/src/main/java/bugtracker/user/BTUserDetails.java

@@ -65,6 +65,10 @@ public boolean isCredentialsNonExpired() {
 
     @Override
     public boolean isEnabled() {
-        return true;
+        return user.getDeletedTs() == null;
+    }
+
+    public Long getId() {
+        return user.getId();
     }
 }

bugtracker/src/main/java/bugtracker/user/UserController.java

@@ -110,8 +110,18 @@ public ResponseEntity<List<UserEntity>> getAllSimpleUser(){
         return new ResponseEntity<>(userService.getUsersByType(2), HttpStatus.OK);
     }
 
+    @GetMapping("/current/")
+    public ResponseEntity<UserEntity> getCurrentUser(Authentication authentication) {
+        if (authentication != null) {
+            BTUserDetails principal = (BTUserDetails) authentication.getPrincipal();
+            return new ResponseEntity<>(userService.getUserById(principal.getId()), HttpStatus.OK);
+        } else {
+            return new ResponseEntity<>(null, HttpStatus.UNAUTHORIZED);
+        }
+    }
+
     @GetMapping("/current/roles")
-    public ResponseEntity<List<String>> getCurrentUser(Authentication authentication){
+    public ResponseEntity<List<String>> getCurrentUserRoles(Authentication authentication){
         if (authentication != null) {
             BTUserDetails principal = (BTUserDetails) authentication.getPrincipal();
             return new ResponseEntity<>(principal.getAuthorities().stream().map(t -> ((GrantedAuthority) t).getAuthority()).collect(toList()), HttpStatus.OK);

bugtracker/src/main/java/bugtracker/user/UserService.java

@@ -34,13 +34,15 @@ public UserEntity createUser(UserEntity user){
     }
 
     public UserEntity deleteUser(UserEntity user){
-        user.setDeletedTs(LocalDateTime.now());
-        return userRepository.save(user);
+        UserEntity userEntity = userRepository.findUserEntityById(user.getId());
+        userEntity.setDeletedTs(LocalDateTime.now());
+        return userRepository.save(userEntity);
     }
 
     public UserEntity undeleteUser(UserEntity user){
-        user.setDeletedTs(null);
-        return userRepository.save(user);
+        UserEntity userEntity = userRepository.findUserEntityById(user.getId());
+        userEntity.setDeletedTs(null);
+        return userRepository.save(userEntity);
     }
 
     public UserEntity modifyUser(UserEntity user){

bugtracker/src/main/resources/static/css/style.css

@@ -1,6 +1,23 @@
 /* Based on ext-6.2.0-gpl/ext-6.2.0/build/examples/classic/responsive-app/resources/ResponsiveApp-all.css
  * © 2019 Sencha Inc. (under the terms of the GPLv3 license) */
 
+.x-dataview-item {
+    border        : 1px solid #dadada;
+    border-radius : 2px;
+    padding       : 2px;
+    margin        : 2px;
+}
+
+.comments .created{
+    font-style:italic
+}
+.comments .user{
+    font-weight:bold
+}
+.comments .content{
+    margin-bottom:10px
+}
+
 .deleted-user .x-grid-cell {
     background-color: #ffe2e2;
     color: #900;
@@ -729,7 +746,8 @@ td.x-frame-br {
 }
 
 .x-splitter {
-    font-size: 1px
+    font-size: 1px;
+    background-color: #3892D4
 }
 
 .x-splitter-horizontal {

bugtracker/src/main/resources/static/js/projects.js

@@ -136,10 +136,11 @@ let projectdetails = function() {
     };
 
     var projectdetailswindow = Ext.create('Ext.Window', {
-        width: 1000,
-        height: 500,
+        width: 560,
+        height: 380,
         padding: 15,
         modal: true,
+        title: "Project details",
         layout: {
             type: 'vbox',
             padding: 5