Bench-173: Aligining Category with API spec (#77)

hospel · martintaylor1635 · AndyFlintAnswerDigital · web-flow · commit b5f95dbd5b46 · 2022-11-21T13:28:09.000Z
* BENCH-63 Added MapStruct dependency into the POM * BENCH-63 Added maven compiler plugin to add MapStruct support to POM * BENCH-63 Added CategoryMapper interface. * BENCH-63 Added ItemMapper interface. * BENCH-63 Added OrderMapper interface * BENCH-63 Renamed AddOrderRequest.java to OrderRequest.java * BENCH-63 Integration of MapStruct into service layer. * BENCH-63 Added update order endpoint, fixed issue relating to get all orders * BENCH-63 Fixed bug relating to get all orders by adding the fetch type as EAGER, also initialised the status within the zero-argument constructor * BENCH-63 Added setters as these are required by the MapStruct library to map objects successfully * BENCH-63 Added unit test. * BENCH-63 Removed star import to comply with check style * BENCH-63 Fixed validation bug, reverted back to parameter-level validation * BENCH-63 Improved readability * BENCH-36 (WIP) - Refactoring in progress * BENCH-81 added unit tests for Category * BENCH-81 adding verification to Category service tests * BENCH-81 checkstyle fixes * BENCH-81 fixing category tests * BENCH-81 updated category tests * BENCH-63 Improved readability * BENCH-63 Added unit test to test update order. * BENCH-63 Updated unit test. * BENCH-46 @builder added to help with tests, also equal and hashcodes with ToString methods manually added to entities * BENCH-85: adding logging to different classes (#17) * BENCH-63 Added MapStruct dependency into the POM * BENCH-63 Added maven compiler plugin to add MapStruct support to POM * adding logging to different classes * BENCH-63 Added CategoryMapper interface. * BENCH-63 Added ItemMapper interface. * BENCH-63 Added OrderMapper interface * BENCH-63 Renamed AddOrderRequest.java to OrderRequest.java * BENCH-63 Integration of MapStruct into service layer. * BENCH-63 Added update order endpoint, fixed issue relating to get all orders * BENCH-63 Fixed bug relating to get all orders by adding the fetch type as EAGER, also initialised the status within the zero-argument constructor * BENCH-63 Added setters as these are required by the MapStruct library to map objects successfully * putting a proper annotation for class level * BENCH-63 Added unit test. * BENCH-63 Removed star import to comply with check style * standardizing API code * reverting test changes * BENCH-63 Fixed validation bug, reverted back to parameter-level validation * BENCH-63 Improved readability * merge conflicts * merge conflict * merge conflicts resolution * reverting test changes * BENCH-63 Improved readability * BENCH-63 Added unit test to test update order. * BENCH-63 Updated unit test. * enabling lombok with mapstruct * merge conflicts * reverting test changes * merge conflicts * merge conflict * merge conflicts resolution * reverting test changes * enabling lombok with mapstruct * merge conflicts * reverting test changes * merge resolution * reverting test changes Co-authored-by: Martin Taylor <martintaylor1635@gmail.com> * BENCH-87 Updated Category and Item controller tests to reflect endpoint naming changes. * Renamed request mappings to plural * BENCH-46 Conflicts resolved * BENCH-87 Updated Category and Item controller tests to reflect endpoint naming changes. * Updated README to link to Amazon Correto 17 * Bench 85 cleanup (#20) * cleanup and adding missing spring-security-test * pom revert * cleanup * BENCH-87 Updated Category and Item controller tests to reflect endpoint naming changes. * Renamed request mappings to plural * Updated README to link to Amazon Correto 17 * BENCH-87 Updated Category and Item controller tests to reflect endpoint naming changes. * BENCH-86 order total price added * BENCH-46 add and remove item functions added to category. also items ignored on json in category request * BENCH-46 category equals updated to check name not id. * BENCH-86 Order total price included * BENCH-86 OrderItem total price updated * BENCH-86 imports optimized * BENCH-81: fixing rest endpoint issue (#23) * fixing rest endpoint issue * transaction update * fixing order adding issue (#24) * BENCH-NONE Added start-answerking.sh script for docker * fixing persistance loading issues (#25) * adding jacoco (#26) * BENCH-69: build workflow (#27) * build workflow * change workflow name * adding jacoco (#26) * adding cache to speed up build process * build workflow * change workflow name * adding cache to speed up build process * BENCH-58 Refactored package names, also changed package names from plural to singular as per BENCH-58 description. * BENCH-58 Fixed PR comment, renamed AnswerkingApplication to AnswerKingApplication and subsequent tests * BENCH-58-FIX Temporarily removed redundant test agreed with Oleksii, will integrate later when more purpose is added. * BENCH-58-FIX Removed OrderControllerIT.java as it was empty and served no purpose. Will re-write. * BENCH-58-FIX Temporarily removed redundant test agreed with Oleksii, will integrate later when more purpose is added. * BENCH-58-FIX Removed OrderControllerIT.java as it was empty and served no purpose. Will re-write. * adding docker build pipeline (#31) * BENCH-108: Bench 108 push images (#32) * build docker images * change branch name * renaming branches * docker image workflow (#33) * adjusting repo name (#34) * BENCH-108: Bench 108 push images4 (#35) * adjusting repo name * docker compose push adjustment * permission change (#37) * BENCH-108: Bench 108 push images6 (#38) * permission change * permission delete * permission delete * change log in (#39) * BENCH-108: Bench 108 push images8 (#40) * change log in * adding another push * BENCH-108: Bench 108 push images9 (#41) * change log in * adding another push * syntax error * syntax error * adding repo name (#42) * push changes (#43) * docker push config (#45) * BENCH-125 refactored error responses to RFC-7807 format * BENCH-125 refactored handling for MethodArgumentNotValidException * BENCH-125 adding errors & traceId fields to RFC-7807 error responses * adjusting github repo name (#46) * repo name update (#47) * tag image (#48) * BENCH-108-REFACTORING Refactored build_docker_package.yml as per requirements by Oleksii. * BENCH-96 Static code analysis added * BENCH-96 Static code analysis property added * BENCH-96 java version specified * BENCH-161 Refactored codebase * BENCH-161 Fixed README.md * BENCH-161 Updated CategoryServiceTest * BENCH-161 Changes reflecting Andrews observations * BENCH-159: change to be compliant with the latest openapi version (#54) * change to be compliant with the latest openapi version * BENCH-161 Refactored codebase * BENCH-161 Fixed README.md * change to be compliant with the latest openapi version * BENCH-161 Updated CategoryServiceTest * rebase with main * add permission * BENCH-161 Changes reflecting Andrews observations * swagger config changes * change to be compliant with the latest openapi version * rebase with main * rebase conflict * add permission * swagger config changes Co-authored-by: martintaylor1635 <martintaylor1635@gmail.com> * adding api tags (#56) * BENCH-153 Updated SQL files to reflect new retired fields added in models. * BENCH-153 Created RetirementException to be thrown when dealing with retirements. * BENCH-153 Added retired field to category * BENCH-153 Updated CategoryController to reflect changes * BENCH-153 Added logic to CategoryService and ItemService * BENCH-153 Updated ItemController to reflect changes * BENCH-153 Updated unit tests in accordance with the new features * BENCH-161 Test * BENCH-161 Test * BENCH-153 Removed available field from Item, and reflected it thoughout * BENCH-153 Addressed PR comments from Andrew * BENCH-153 Addressed PR comments from Andrew * BENCH-153 Updated RetirementException to reflect 404 not found rather than bad request * BENCH-153 Refactored RetirementException returning 410 GONE status * BENCH-153 Refactored Product model, added retired field to constructor * BENCH-153 Explicitly configured the ProductMapper to default the retired field to false when mapping a ProductRequest to a Product * BENCH-153 Addressed Andrews PR Comment: relocated constructor in Category model * BENCH-153 Addressed Andrews PR Comment: renamed local variable name within retireProduct in ProductService * BENCH-153 Addressed Andrews PR Comment: I would also suggest searching the codebase for any strings matching 'available' and see if there are any other ones we've missed * BENCH-153 Addressed Andrews PR Comment: Was this a mistake with the rebase? Seems a bit sparse * BENCH-56 v2 academy package removed. * BENCH-108-REFACTORING Refactored build_docker_package.yml as per requirements by Oleksii. * BENCH-108-REFACTORING Added the develop branc * BENCH-108-REFACTORING Added the master branch * BENCH-108-REFACTORING Added develop branch to the build_integration_and_code_analysis.yml workflow * Dependabot Yaml Set Up * Automatically approve dependabot pull requests * Updated package-ecosystem to Maven * Bump springdoc-openapi-maven-plugin from 0.2 to 1.4 Bumps [springdoc-openapi-maven-plugin](https://github.com/springdoc/springdoc-openapi-maven-plugin) from 0.2 to 1.4. - [Release notes](https://github.com/springdoc/springdoc-openapi-maven-plugin/releases) - [Commits](springdoc/springdoc-openapi-maven-plugin@v0.2...v1.4) --- updated-dependencies: - dependency-name: org.springdoc:springdoc-openapi-maven-plugin dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * Added github-actions ecosystem to dependabot.yml * Bump dependabot/fetch-metadata from 1.1.1 to 1.3.5 Bumps [dependabot/fetch-metadata](https://github.com/dependabot/fetch-metadata) from 1.1.1 to 1.3.5. - [Release notes](https://github.com/dependabot/fetch-metadata/releases) - [Commits](dependabot/fetch-metadata@v1.1.1...v1.3.5) --- updated-dependencies: - dependency-name: dependabot/fetch-metadata dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Bump actions/cache from 1 to 3 Bumps [actions/cache](https://github.com/actions/cache) from 1 to 3. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](actions/cache@v1...v3) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * BENCH-108-REFACTORING Refactored build_docker_package.yml as per requirements by Oleksii. * BENCH-108-REFACTORING Added the develop branc * BENCH-108-REFACTORING Added the master branch * BENCH-108-REFACTORING Added develop branch to the build_integration_and_code_analysis.yml workflow * Bump maven-wrapper-plugin from 3.1.0 to 3.1.1 (#60) Bumps [maven-wrapper-plugin](https://github.com/apache/maven-wrapper) from 3.1.0 to 3.1.1. - [Release notes](https://github.com/apache/maven-wrapper/releases) - [Commits](apache/maven-wrapper@maven-wrapper-parent-3.1.0...maven-wrapper-3.1.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-wrapper-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * BENCH-108-REFACTORING Refactored build_docker_package.yml as per requirements by Oleksii. * BENCH-108-REFACTORING Added the develop branc * BENCH-108-REFACTORING Added the master branch * BENCH-108-REFACTORING Added develop branch to the build_integration_and_code_analysis.yml workflow * Added github.actor check to dependabot workflow * sonar key update to project name. * github action checkout updated to v3 * Updated dependabot.yml pull request limit + prefix * BENCH-174 Added get category by ID endpoint * BENCH-172 Created NameUnavailableException and ProductAlreadyPresentException * BENCH-172 Updated services to reflect changes * BENCH-172 Updated tests to reflect changes * BENCH-148 Refactored SecurityConfig and added dependency for Snake YAML * BENCH-148 Fixed checkstyle complaints * BENCH-148 Added scope to POM dependency * Replaced primitive longs with Wrapper Class Longs * adding missing fields as per API spec * adding missing fields as per API spec * BENCH-179 Updated the MySQL dependency within the POM * BENCH-180 Refactored Spring Security Config and resolved warnings * BENCH-180 Addressed checkstyle warnings * test adjustments * test adjustments * small method optimization * small method optimization * adding missing fields as per API spec * adding missing fields as per API spec * test adjustments * test adjustments * small method optimization * small method optimization * BENCH-184 getting order 500 error fixed on all endpoints. * BENCH-162 Updated status codes for create product and category * BENCH-162 Reflected changes within tests * BENCH-185 Refactored Dockerfile, removed maintainer reference and switched to corretto image * BENCH-185 Created a batch script from Windows users to initialise Docker * BENCH-185 Updated bash script to initialise Docker * BENCH-185 Updated bash and batch script * BENCH-185 Updated bash script, changed operations order * BENCH-185 Overridden the banner for startup * adding more swagger docs (#80) * adding missing fields as per API spec * adding missing fields as per API spec * test adjustments * test adjustments * small method optimization * small method optimization * rebase with main * rebase with main * rebase with main * rebase with main * adding full stops * adding full stops * BENCH-184 made removing item from basket transactional * added missed final * adding missing fields as per API spec * test adjustments * small method optimization * rebase with main * rebase with main * rebase * rebase * rebase * rebase * rebase * adding full stops * added missed final * rebase * rebase * rebase with main * rebase with main * rebase * rebase * rebase * removing empty lines * rebase * rebase with main * rebase with main * rebase * rebase * added missed final * rebase * rebase with main * rebase with main * rebase * rebase * rebase Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Martin Taylor <martintaylor1635@gmail.com> Co-authored-by: Andy Flint <andrew.flint@answerdigital.com> Co-authored-by: AudriusPutys <audrius.putys@answerdigital.com> Co-authored-by: AndyFlintAnswerDigital <116072207+AndyFlintAnswerDigital@users.noreply.github.com> Co-authored-by: MohammadIqbalAD <mohammad.iqbal@answerdigital.com> Co-authored-by: AudriusPutys <116072957+AudriusPutys@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: MohammadIqbalAD <116073157+MohammadIqbalAD@users.noreply.github.com>
diff --git a/.env b/.env
@@ -0,0 +1,5 @@
+COMPOSE_PROJECT_NAME=answer-king-rest-api
+MYSQLDB_ROOT_PASSWORD=
+MYSQLDB_DATABASE=answer_king
+MYSQLDB_USER=test_user
+MYSQLDB_PASSWORD=
diff --git a/src/main/java/com/answerdigital/answerking/config/SecurityConfig.java b/src/main/java/com/answerdigital/answerking/config/SecurityConfig.java
@@ -5,10 +5,11 @@
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.http.SessionCreationPolicy;
 import org.springframework.security.core.userdetails.User;
-import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.provisioning.InMemoryUserDetailsManager;
 import org.springframework.security.web.SecurityFilterChain;
 
+import java.util.List;
+
 @EnableWebSecurity
 public class SecurityConfig {
     private static final String[] PERMITTED_PATTERNS = {
@@ -44,26 +45,17 @@ public SecurityFilterChain securityFilterChain(final HttpSecurity http) throws E
 
     @Bean
     public InMemoryUserDetailsManager userDetailsManager() {
-        final UserDetails paul = User.withUsername("paul")
-                .password(COMMON_PASSWORD)
-                .authorities(COMMON_ROLE)
-                .build();
-
-        final UserDetails john = User.withUsername("john")
-                .password(COMMON_PASSWORD)
-                .authorities(COMMON_ROLE)
-                .build();
-
-        final UserDetails ringo = User.withUsername("ringo")
-                .password(COMMON_PASSWORD)
-                .authorities(COMMON_ROLE)
-                .build();
 
-        final UserDetails george = User.withUsername("george")
-                .password(COMMON_PASSWORD)
-                .authorities(COMMON_ROLE)
-                .build();
-
-        return new InMemoryUserDetailsManager(paul, john, ringo, george);
+        return new InMemoryUserDetailsManager(
+            List.of("paul", "john", "ringo", "george")
+                                            .stream()
+                                            .map(user -> {
+                                                return User.withUsername(user)
+                                                           .password(COMMON_PASSWORD)
+                                                           .authorities(COMMON_ROLE)
+                                                           .build();
+                                            }).toList()
+        );
     }
+
 }
diff --git a/src/main/java/com/answerdigital/answerking/controller/CategoryController.java b/src/main/java/com/answerdigital/answerking/controller/CategoryController.java
@@ -42,7 +42,7 @@ public CategoryController(final CategoryService categoryService) {
         this.categoryService = categoryService;
     }
 
-    @Operation(summary = "Create a new category")
+    @Operation(summary = "Create a new category.")
     @ApiResponses(value = {
         @ApiResponse(responseCode = "201", description = "When the category has been created.",
                 content = { @Content(mediaType = "application/json", schema = @Schema(implementation = Category.class)) }),
@@ -56,9 +56,9 @@ public ResponseEntity<Category> addCategory(@Valid @RequestBody final AddCategor
                                                         errors.hasErrors() ? HttpStatus.BAD_REQUEST : HttpStatus.CREATED);
     }
 
-    @Operation(summary = "Get all categories")
+    @Operation(summary = "Get all categories.")
     @ApiResponses(value = {
-        @ApiResponse(responseCode = "200", description = "Found the list of categories",
+        @ApiResponse(responseCode = "200", description = "Found the list of categories.",
             content = { @Content(mediaType = "application/json", schema = @Schema(implementation = Category.class)) })
     })
     @GetMapping
@@ -67,19 +67,19 @@ public ResponseEntity<Collection<Category>> getAllCategories() {
         return new ResponseEntity<>(categories, categories.isEmpty() ? HttpStatus.NO_CONTENT : HttpStatus.OK);
     }
 
-    @Operation(summary = "Get a single category")
+    @Operation(summary = "Get a single category.")
     @ApiResponses(value = {
         @ApiResponse(responseCode = "200", description = "When the category with the provided id has been found.",
                 content = { @Content(mediaType = "application/json", schema = @Schema(implementation = Category.class)) }),
-        @ApiResponse(responseCode = "404", description = "When the category with the given id does not exist",
+        @ApiResponse(responseCode = "404", description = "When the category with the given id does not exist.",
                 content = { @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorResponse.class)) })
     })
     @GetMapping("/{categoryId}")
     public ResponseEntity<Category> getCategoryById(@PathVariable @NotNull final Long categoryId) {
         return new ResponseEntity<>(categoryService.findById(categoryId), HttpStatus.OK);
     }
 
-    @Operation(summary = "Add product to a category")
+    @Operation(summary = "Add product to a category.")
     @ApiResponses(value = {
         @ApiResponse(responseCode = "200", description = "Add product to a category.",
                 content = { @Content(mediaType = "application/json", schema = @Schema(implementation = Category.class)) })
@@ -90,7 +90,7 @@ public ResponseEntity<Category> addProductToCategory(@PathVariable @NotNull fina
         return new ResponseEntity<>(categoryService.addProductToCategory(categoryId, productId), HttpStatus.OK);
     }
 
-    @Operation(summary = "Remove product from a category")
+    @Operation(summary = "Remove product from a category.")
     @ApiResponses(value = {
         @ApiResponse(responseCode = "200", description = "Remove product from a category.",
                 content = { @Content(mediaType = "application/json", schema = @Schema(implementation = Category.class)) })
diff --git a/src/main/java/com/answerdigital/answerking/mapper/CategoryMapper.java b/src/main/java/com/answerdigital/answerking/mapper/CategoryMapper.java
@@ -4,11 +4,26 @@
 import com.answerdigital.answerking.request.AddCategoryRequest;
 import com.answerdigital.answerking.request.UpdateCategoryRequest;
 import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
 import org.mapstruct.MappingTarget;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
+import java.time.ZoneOffset;
 
-@Mapper(componentModel = "spring")
+@Mapper(componentModel = "spring", imports = {DateTimeFormatter.class, ZoneOffset.class, ZonedDateTime.class, ChronoUnit.class})
 public interface CategoryMapper {
+
+    @Mapping(target = "createdOn", expression = "java( ZonedDateTime.now(ZoneOffset.UTC)" +
+                                                    ".truncatedTo( ChronoUnit.SECONDS )" +
+                                                    ".format( DateTimeFormatter.ofPattern( \"yyyy-MM-dd HH:mm:ss\" ) ) )")
+    @Mapping(target = "lastUpdated", expression = "java( ZonedDateTime.now(ZoneOffset.UTC)" +
+                                                        ".truncatedTo( ChronoUnit.SECONDS )" +
+                                                        ".format( DateTimeFormatter.ofPattern( \"yyyy-MM-dd HH:mm:ss\" ) ) )")
     Category addRequestToCategory(AddCategoryRequest addCategoryRequest);
 
+    @Mapping(target = "lastUpdated", expression = "java( ZonedDateTime.now(ZoneOffset.UTC)" +
+                                                    ".truncatedTo( ChronoUnit.SECONDS )" +
+                                                    ".format( DateTimeFormatter.ofPattern( \"yyyy-MM-dd HH:mm:ss\" ) ) )")
     Category updateRequestToCategory(@MappingTarget Category category, UpdateCategoryRequest updateCategoryRequest);
 }
diff --git a/src/main/java/com/answerdigital/answerking/model/Category.java b/src/main/java/com/answerdigital/answerking/model/Category.java
@@ -2,6 +2,7 @@
 
 import com.answerdigital.answerking.request.AddCategoryRequest;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -19,6 +20,10 @@
 import javax.persistence.ManyToMany;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Pattern;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
 import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
@@ -44,6 +49,12 @@ public class Category {
             message = "Category description can only contain letters, numbers, spaces and !?-.,' punctuation")
     private String description;
 
+    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+    private String createdOn;
+
+    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+    private String lastUpdated;
+
     private boolean retired;
 
     @ManyToMany(fetch = FetchType.LAZY)
@@ -57,13 +68,21 @@ public class Category {
     public Category(final AddCategoryRequest categoryRequest) {
         this.name = categoryRequest.name();
         this.description = categoryRequest.description();
+        this.createdOn = ZonedDateTime.now(ZoneOffset.UTC)
+                                      .truncatedTo( ChronoUnit.SECONDS )
+                                      .format( DateTimeFormatter.ofPattern( "yyyy-MM-dd HH:mm::ss" ) );
+        this.lastUpdated = this.createdOn;
         this.retired = false;
     }
 
     public Category(final String name, final String description) {
         this.name = name;
         this.description = description;
         this.retired = false;
+        this.createdOn = ZonedDateTime.now(ZoneOffset.UTC)
+                                      .truncatedTo( ChronoUnit.SECONDS )
+                                      .format( DateTimeFormatter.ofPattern( "yyyy-MM-dd HH:mm::ss" ) );
+        this.lastUpdated = this.createdOn;
     }
 
     public void addProduct(final Product product) {
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
@@ -16,7 +16,7 @@ spring:
 
   jpa:
     hibernate:
-      ddl-auto: none
+      ddl-auto: update
 
     properties:
       hibernate:
@@ -32,7 +32,7 @@ spring:
 
   datasource:
     username: test_user
-    password: ***REMOVED***
+    password: GS3ef_fsd^!
     url: jdbc:mysql://localhost:3306/answer_king
 
 ---
@@ -43,7 +43,7 @@ spring:
 
   datasource:
     username: test_user
-    password: ***REMOVED***
+    password: GS3ef_fsd^!
     url: jdbc:mysql://localhost:3306/answer_king_test
 
 ---
@@ -54,5 +54,5 @@ spring:
 
   datasource:
     username: test_user
-    password: ***REMOVED***
+    password: GS3ef_fsd^!
     url: jdbc:mysql://mysqldb:3306/answer_king
diff --git a/src/main/resources/schema.sql b/src/main/resources/schema.sql
@@ -12,6 +12,8 @@ CREATE TABLE IF NOT EXISTS category (
     id BIGINT NOT NULL AUTO_INCREMENT,
     name VARCHAR(255),
     description VARCHAR(255) NOT NULL,
+    createdOn VARCHAR(255) NOT NULL,
+    lastUpdated VARCHAR(255) NOT NULL,
     retired BIT(1) NOT NULL,
 
     PRIMARY KEY (id)
diff --git a/src/test/java/com/answerdigital/answerking/controller/CategoryControllerTest.java b/src/test/java/com/answerdigital/answerking/controller/CategoryControllerTest.java
@@ -15,6 +15,11 @@
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.web.servlet.MockMvc;
 
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
+
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -63,6 +68,9 @@ void addCategoryTest() throws Exception {
         final var addCategoryRequest =  new AddCategoryRequest("random name", "random description");
         final var category = new Category(addCategoryRequest);
         final var categoryRequest = "{\"name\": \"random name\",\"description\": \"random description\"}";
+        final String testDate = ZonedDateTime.now( ZoneId.of( "Etc/UTC" ) )
+                                            .truncatedTo( ChronoUnit.SECONDS )
+                                            .format( DateTimeFormatter.ofPattern( "yyyy-MM-dd HH:mm:ss" ) );
 
         doReturn(category).when(categoryService).addCategory(addCategoryRequest);
         final var response = mvc.perform(post("/categories")
@@ -76,6 +84,7 @@ void addCategoryTest() throws Exception {
         assertFalse(response.getContentAsString().isEmpty());
         assertEquals(addCategoryRequest.name(), resultJsonNode.get("name").textValue());
         assertEquals(addCategoryRequest.description(), resultJsonNode.get("description").textValue());
+        assertEquals(testDate.split(" ")[0], resultJsonNode.get("createdOn").textValue().split(" ")[0]);
     }
 
     @Test
@@ -115,6 +124,9 @@ void updateCategoryTest() throws Exception {
         final var category = new Category(newRandomName, newRandomDesc);
         final var categoryId = 112L;
         final var  updateCategoryRequestJson = "{\"name\": \"random name\",\"description\": \"random description\"}";
+        String testDate = ZonedDateTime.now( ZoneId.of( "Etc/UTC" ) )
+                                       .truncatedTo( ChronoUnit.SECONDS )
+                                       .format( DateTimeFormatter.ofPattern( "yyyy-MM-dd HH:mm:ss" ) );
 
         doReturn(category).when(categoryService).updateCategory(updateCategoryRequest, categoryId);
         final var response = mvc.perform(put("/categories/{categoryId}", categoryId)
@@ -128,6 +140,7 @@ void updateCategoryTest() throws Exception {
         assertFalse(response.getContentAsString().isEmpty());
         assertEquals(newRandomName, resultJsonNode.get("name").textValue());
         assertEquals(newRandomDesc, resultJsonNode.get("description").textValue());
+        assertEquals(testDate.split(" ")[0], resultJsonNode.get("lastUpdated").textValue().split(" ")[0]);
     }
 
     @Test
