Adding UserService and NoteService tests

demo/.gitignore

@@ -1,2 +1,5 @@
 .idea/
 .gradle/
+gradle/
+.DS_STORE
+target/

demo/pom.xml

@@ -72,6 +72,12 @@
 			<artifactId>modelmapper</artifactId>
 			<version>2.3.0</version>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.security</groupId>
+			<artifactId>spring-security-test</artifactId>
+			<version>4.0.0.RELEASE</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 	<build>

demo/src/main/java/com/example/easynotes/controller/NoteController.java

@@ -24,13 +24,13 @@ public List<NotesDto> getAllNotesByUserId(@PathVariable (value = "userId") Long
     //Create a new Note
     @PostMapping("/{userId}/notes")
     public NotesDto createNote(@PathVariable (value = "userId") Long userId, @Valid @RequestBody NotesDto notesDto) throws ParseException {
-        return noteService.createNote1(userId, notesDto);
+        return noteService.createNote(userId, notesDto);
     }
 
     //Get a Single Note
     @GetMapping("/{userId}/notes/{noteId}")
     public NotesDto getNoteByUserIdAndNoteId(@PathVariable(value = "userId") Long userId, @PathVariable(value = "noteId") Long noteId) throws ParseException {
-        return noteService.getNoteByUserAndNoteId(userId, noteId);
+        return noteService.getNoteByUserIdAndNoteId(userId, noteId);
     }
 
     //Update a Note

demo/src/main/java/com/example/easynotes/dto/ApplicationUserDto.java

@@ -4,9 +4,9 @@
 
 public class ApplicationUserDto {
     private Long id;
-    private Date createdAt;
     private String username;
     private Date updatedAt;
+    private Date createdAt;
 
     public void setId(Long id) {
         this.id = id;

demo/src/main/java/com/example/easynotes/dto/DtoManager.java

@@ -3,22 +3,36 @@
 import com.example.easynotes.model.ApplicationUser;
 import com.example.easynotes.model.Note;
 import org.modelmapper.ModelMapper;
+import org.modelmapper.TypeMap;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 import java.text.ParseException;
 
+@Service
 public class DtoManager {
+
+    private final ModelMapper modelMapper;
+
     @Autowired
-    private final ModelMapper modelMapper = new ModelMapper();
+    public DtoManager(ModelMapper modelMapper) {
+        this.modelMapper = modelMapper;
+    }
 
     public Note convertToEntity(NotesDto notesDto) throws ParseException {
         Note note = modelMapper.map(notesDto, Note.class);
         return note;
     }
 
-    public NotesDto convertToDto(Note note){
-        NotesDto noteDto = modelMapper.map(note, NotesDto.class);
-        return noteDto;
+    public NotesDto convertFromNoteToNotesDto(Note note){
+        TypeMap<Note, NotesDto> typeMap = modelMapper.getTypeMap(Note.class, NotesDto.class);
+        if (typeMap == null) {
+            TypeMap<Note, NotesDto> typeMap1 = modelMapper.createTypeMap(Note.class, NotesDto.class);
+            typeMap1.includeBase(Note.class, NotesDto.class);
+            typeMap = typeMap1;
+        }
+
+        return typeMap.map(note);
     }
 
     public ApplicationUser convertToEntity(ApplicationUserDto userDto) throws ParseException {

demo/src/main/java/com/example/easynotes/dto/NotesDto.java

@@ -1,11 +1,8 @@
 package com.example.easynotes.dto;
 
-import org.modelmapper.ModelMapper;
-import org.springframework.beans.factory.annotation.Autowired;
+import java.util.Date;
 
 public class NotesDto {
-    @Autowired
-    private ModelMapper modelMapper;
 
     private Long noteId;
 
@@ -15,6 +12,26 @@ public class NotesDto {
 
     private ApplicationUserDto user;
 
+    private Date updatedAt;
+
+    private Date createdAt;
+
+    public Date getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(Date createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public Date getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(Date updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
     public Long getNoteId() {
         return noteId;
     }

demo/src/main/java/com/example/easynotes/model/ApplicationUser.java

@@ -1,22 +1,54 @@
 package com.example.easynotes.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
 import javax.persistence.*;
-import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
 
 @Entity
 @Table(name = "users")
-public class ApplicationUser extends AuditModel {
+@EntityListeners(AuditingEntityListener.class)
+@JsonIgnoreProperties(value = {"createdAt", "updatedAt"}, allowGetters = true)
+public class ApplicationUser implements Serializable {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
-    @NotNull
     @Column(unique = true)
     private String username;
 
-    @NotNull
     private String password;
 
+    @Temporal(TemporalType.TIMESTAMP)
+    @Column(name = "created_at", nullable = false, updatable = false)
+    @CreatedDate
+    private Date createdAt;
+
+    @Temporal(TemporalType.TIMESTAMP)
+    @Column(name = "updated_at", nullable = false)
+    @LastModifiedDate
+    private Date updatedAt;
+
+    public Date getCreatedAt() {
+        return this.createdAt;
+    }
+
+    public void setCreatedAt(Date createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public Date getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(Date updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
     public ApplicationUser() { }
 
     public Long getId() {

demo/src/main/java/com/example/easynotes/model/Note.java

@@ -1,28 +1,60 @@
 package com.example.easynotes.model;
 
+import com.example.easynotes.dto.ApplicationUserDto;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
 import javax.persistence.*;
-import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
 
 @Entity
 @Table(name = "notes")
-public class Note extends AuditModel {
+@EntityListeners(AuditingEntityListener.class)
+@JsonIgnoreProperties(value = {"createdAt", "updatedAt"}, allowGetters = true)
+public class Note implements Serializable {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long noteId;
 
-    @NotNull
     @Lob
     private String title;
 
-    @NotNull
     @Lob
     private String content;
 
     @ManyToOne(fetch = FetchType.LAZY, optional = false)
     @JoinColumn(name = "user_id", nullable = false)
     private ApplicationUser user;
 
+    @Temporal(TemporalType.TIMESTAMP)
+    @Column(name = "created_at", nullable = false, updatable = false)
+    @CreatedDate
+    private Date createdAt;
+
+    @Temporal(TemporalType.TIMESTAMP)
+    @Column(name = "updated_at", nullable = false)
+    @LastModifiedDate
+    private Date updatedAt;
+
+    public Date getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(Date createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public Date getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(Date updatedAt) {
+        this.updatedAt = updatedAt;
+    }
 
     public Long getNoteId() {
         return noteId;
@@ -40,7 +72,7 @@ public void setUser(ApplicationUser user) {
         this.user = user;
     }
 
-    protected Note() { }
+    public Note() { }
 
     public String getTitle() {
         return title;

demo/src/main/java/com/example/easynotes/security/WebSecurity.java

@@ -26,17 +26,35 @@ public WebSecurity(UserDetailsServiceImpl userDetailsService, BCryptPasswordEnco
     }
 
     protected void configure(HttpSecurity httpSecurity) throws Exception{
-        httpSecurity.cors().and().csrf().disable().authorizeRequests().antMatchers(HttpMethod.POST, SIGN_UP_URL).permitAll().anyRequest().authenticated().and().addFilter(new JWTAuthenticationFilter(authenticationManager())).addFilter(new JWTAuthorizationFilter(authenticationManager())).sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS);
+        httpSecurity
+                .cors()
+                .and()
+                .csrf()
+                .disable()
+                .authorizeRequests()
+                .antMatchers(HttpMethod.POST, SIGN_UP_URL)
+                .permitAll()
+                .anyRequest()
+                .authenticated()
+                .and()
+                .addFilter(new JWTAuthenticationFilter(authenticationManager()))
+                .addFilter(new JWTAuthorizationFilter(authenticationManager()))
+                .sessionManagement()
+                .sessionCreationPolicy(SessionCreationPolicy.STATELESS);
     }
 
     public void configure(AuthenticationManagerBuilder authenticationManagerBuilder) throws Exception{
-        authenticationManagerBuilder.userDetailsService(userDetailsService).passwordEncoder(bCryptPasswordEncoder);
+        authenticationManagerBuilder
+                .userDetailsService(userDetailsService)
+                .passwordEncoder(bCryptPasswordEncoder);
     }
 
     @Bean
     CorsConfigurationSource corsConfigurationSource(){
         final UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
-        source.registerCorsConfiguration("/**", new CorsConfiguration().applyPermitDefaultValues());
+        source
+                .registerCorsConfiguration("/**", new CorsConfiguration()
+                        .applyPermitDefaultValues());
         return source;
     }
 }