.gitignore

@@ -5,9 +5,6 @@ build/
 !**/src/main/**
 !**/src/test/**
 
-application-mysql.yml
-application-postgres.yml
-
 ### STS ###
 .apt_generated
 .classpath

build.gradle

@@ -13,8 +13,6 @@ repositories {
 }
 
 dependencies {
-    implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
-
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'io.springfox:springfox-swagger2:2.9.2'

homework/Home.md

@@ -1,5 +0,0 @@
-### Homework
-
-- [ ] Create project all functions from start
-- [ ] Add functions into BaseService (CRUD)
-- [ ] Create BaseController

src/main/java/com/cubetiqs/demo/Constants.java

@@ -1,5 +0,0 @@
-package com.cubetiqs.demo;
-
-public final class Constants {
-    public static final String STATUS = "status";
-}

src/main/java/com/cubetiqs/demo/config/BaseRepositoryConfig.java

@@ -1,10 +0,0 @@
-package com.cubetiqs.demo.config;
-
-import com.cubetiqs.demo.repository.BaseRepositoryImpl;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
-
-@Configuration
-@EnableJpaRepositories(repositoryBaseClass = BaseRepositoryImpl.class, basePackages = "com.cubetiqs.demo.repository")
-public class BaseRepositoryConfig {
-}

src/main/java/com/cubetiqs/demo/domain/BaseEntity.java

@@ -1,6 +1,5 @@
 package com.cubetiqs.demo.domain;
 
-import com.cubetiqs.demo.Constants;
 import org.springframework.data.domain.Persistable;
 
 import javax.persistence.*;
@@ -17,10 +16,6 @@ public class BaseEntity<ID extends Serializable> implements Serializable, Persis
     @Temporal(TemporalType.TIMESTAMP)
     private Date createdDate;
 
-    @Column(name = Constants.STATUS)
-    @Enumerated(EnumType.ORDINAL)
-    private Status status;
-
     public void setId(ID id) {
         this.id = id;
     }
@@ -43,14 +38,6 @@ public class BaseEntity<ID extends Serializable> implements Serializable, Persis
         this.createdDate = createdDate;
     }
 
-    public void setStatus(Status status) {
-        this.status = status;
-    }
-
-    public Status getStatus() {
-        return status;
-    }
-
     @PrePersist
     public void beforeSave() {
         if (createdDate == null) {

src/main/java/com/cubetiqs/demo/domain/Status.java

@@ -1,6 +0,0 @@
-package com.cubetiqs.demo.domain;
-
-public enum Status {
-    ACTIVE,
-    DEACTIVE
-}

src/main/java/com/cubetiqs/demo/domain/view/UserView.java

@@ -1,20 +0,0 @@
-package com.cubetiqs.demo.domain.view;
-
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@JsonPropertyOrder(value = {
-        "email",
-        "id"
-})
-public class UserView implements Serializable {
-    private Long id;
-    private String email;
-}

src/main/java/com/cubetiqs/demo/repository/BaseRepository.java

@@ -1,12 +0,0 @@
-package com.cubetiqs.demo.repository;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.repository.NoRepositoryBean;
-
-import java.io.Serializable;
-import java.util.List;
-
-@NoRepositoryBean
-public interface BaseRepository<T, ID extends Serializable> extends JpaRepository<T, ID> {
-    List<T> findAllActives();
-}

src/main/java/com/cubetiqs/demo/repository/BaseRepositoryImpl.java

@@ -1,30 +0,0 @@
-package com.cubetiqs.demo.repository;
-
-import com.cubetiqs.demo.Constants;
-import com.cubetiqs.demo.domain.Status;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.data.jpa.repository.support.JpaEntityInformation;
-import org.springframework.data.jpa.repository.support.SimpleJpaRepository;
-import org.springframework.data.repository.NoRepositoryBean;
-
-import javax.persistence.EntityManager;
-import java.io.Serializable;
-import java.util.List;
-
-@NoRepositoryBean
-public class BaseRepositoryImpl<T, ID extends Serializable>
-        extends SimpleJpaRepository<T, ID>
-        implements BaseRepository<T, ID> {
-    private final EntityManager entityManager;
-    public BaseRepositoryImpl(JpaEntityInformation<T, ?> entityInformation, EntityManager entityManager) {
-        super(entityInformation, entityManager);
-        this.entityManager = entityManager;
-    }
-
-    @Override
-    public List<T> findAllActives() {
-        Specification<T> specification = (Specification<T>) (root, query, criteriaBuilder) ->
-                criteriaBuilder.equal(root.get(Constants.STATUS), Status.ACTIVE);
-        return findAll(specification);
-    }
-}

src/main/java/com/cubetiqs/demo/repository/PostRepository.java

@@ -1,10 +1,10 @@
 package com.cubetiqs.demo.repository;
 
 import com.cubetiqs.demo.domain.PostEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
-
 @Repository
-public interface PostRepository extends BaseRepository<PostEntity, Long> {
-
+public interface PostRepository extends JpaRepository<PostEntity, Long> {
+    
 }

src/main/java/com/cubetiqs/demo/repository/UserRepository.java

@@ -1,23 +1,10 @@
 package com.cubetiqs.demo.repository;
 
 import com.cubetiqs.demo.domain.UserEntity;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
-import java.util.Optional;
-
 @Repository
-public interface UserRepository extends BaseRepository<UserEntity, Long> {
-    Optional<UserEntity> findFirstByEmail(String email);
-
-    @Query(value = "select * from users u where u.email = ?1", nativeQuery = true)
-    Optional<UserEntity> fetchFirstByEmail(String email);
-
-    @Query(value = "select * from users u", nativeQuery = true)
-    Page<UserEntity> fetchAllUsers(Pageable pageable);
-
-    @Query(value = "select * from users u where lower(u.email) like ?1", nativeQuery = true)
-    Page<UserEntity> searchByEmail(String likeEmail, Pageable pageable);
+public interface UserRepository extends JpaRepository<UserEntity, Long> {
+        
 }

src/main/java/com/cubetiqs/demo/rest/PostController.java

@@ -1,33 +0,0 @@
-package com.cubetiqs.demo.rest;
-
-import com.cubetiqs.demo.service.PostService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Pageable;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping(path = {"/posts"})
-public class PostController {
-    private final PostService postService;
-
-    @Autowired
-    public PostController(PostService postService) {
-        this.postService = postService;
-    }
-
-    @GetMapping
-    public ResponseEntity<Object> getAllPosts(
-            Pageable pageable,
-            @RequestParam(value = "view", defaultValue = "list") String viewType,
-            @RequestParam(value = "q", defaultValue = "") String q
-    ) {
-        if ("list".equalsIgnoreCase(viewType)) {
-            return ResponseEntity.ok(postService.findAllActives());
-        }
-        return ResponseEntity.ok(postService.findAll(pageable));
-    }
-}

src/main/java/com/cubetiqs/demo/rest/UserController.java

@@ -1,11 +1,8 @@
 package com.cubetiqs.demo.rest;
 
 import com.cubetiqs.demo.domain.UserEntity;
-import com.cubetiqs.demo.domain.view.UserView;
 import com.cubetiqs.demo.repository.UserRepository;
-import com.cubetiqs.demo.service.UserNotFoundException;
 import com.cubetiqs.demo.service.UserService;
-import com.cubetiqs.demo.util.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -16,7 +13,6 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 import java.util.Optional;
 
-
 @RestController
 @RequestMapping(path = {"/users"})
 public class UserController {
@@ -31,31 +27,7 @@ public class UserController {
 
     @GetMapping
     public List<UserEntity> getAllUsers(Pageable pageable) {
-        return userService.findAllActives();
-    }
-
-    @GetMapping("/searchByEmail")
-    public Page<UserView> searchByEmail(
-            Pageable pageable,
-            @RequestParam(value = "q", defaultValue = "") String q
-    ) {
-        return userService.searchByEmailAsView(StringUtils.stringQuery(q), pageable);
-    }
-
-    @GetMapping("/allUsers")
-    public Page<UserEntity> fetchAllUsers(Pageable pageable) {
-        return userRepository.fetchAllUsers(Pageable.unpaged());
-    }
-
-    @GetMapping("/findByEmail/{email}")
-    public ResponseEntity<Object> getUserById(
-            @PathVariable String email
-    ) {
-        try {
-            return ResponseEntity.ok(userService.findByEmail(email));
-        } catch (UserNotFoundException ex) {
-            return ResponseEntity.status(HttpStatus.NOT_FOUND).body(ex.getMessage());
-        }
+        return userService.findAllUsers();
     }
 
     @GetMapping("/{id}")

src/main/java/com/cubetiqs/demo/service/BaseService.java

@@ -1,18 +0,0 @@
-package com.cubetiqs.demo.service;
-
-import com.cubetiqs.demo.repository.BaseRepository;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.repository.NoRepositoryBean;
-
-import java.io.Serializable;
-import java.util.List;
-
-@NoRepositoryBean
-public interface BaseService<T, ID extends Serializable> {
-    BaseRepository<T, ID> getRepository();
-    Page<T> findAll(Pageable pageable, String q);
-    Page<T> findAll(Pageable pageable);
-    List<T> findAll();
-    List<T> findAllActives();
-}

src/main/java/com/cubetiqs/demo/service/BaseServiceImpl.java

@@ -1,26 +0,0 @@
-package com.cubetiqs.demo.service;
-
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.repository.NoRepositoryBean;
-
-import java.io.Serializable;
-import java.util.List;
-
-@NoRepositoryBean
-public abstract class BaseServiceImpl<T, ID extends Serializable> implements BaseService<T, ID> {
-    @Override
-    public List<T> findAll() {
-        return getRepository().findAll();
-    }
-
-    @Override
-    public Page<T> findAll(Pageable pageable) {
-        return getRepository().findAll(pageable);
-    }
-
-    @Override
-    public List<T> findAllActives() {
-        return getRepository().findAllActives();
-    }
-}

src/main/java/com/cubetiqs/demo/service/PostService.java

@@ -1,8 +0,0 @@
-package com.cubetiqs.demo.service;
-
-import com.cubetiqs.demo.domain.PostEntity;
-import org.springframework.stereotype.Service;
-
-@Service
-public interface PostService extends BaseService<PostEntity, Long> {
-}

src/main/java/com/cubetiqs/demo/service/PostServiceImpl.java

@@ -1,36 +0,0 @@
-package com.cubetiqs.demo.service;
-
-import com.cubetiqs.demo.domain.PostEntity;
-import com.cubetiqs.demo.repository.BaseRepository;
-import com.cubetiqs.demo.repository.PostRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-public class PostServiceImpl extends BaseServiceImpl<PostEntity, Long> implements PostService {
-    private final PostRepository postRepository;
-
-    @Autowired
-    public PostServiceImpl(PostRepository postRepository) {
-        this.postRepository = postRepository;
-    }
-
-    @Override
-    public BaseRepository<PostEntity, Long> getRepository() {
-        return postRepository;
-    }
-
-    @Override
-    public Page<PostEntity> findAll(Pageable pageable, String q) {
-        return null;
-    }
-
-    @Override
-    public List<PostEntity> findAllActives() {
-        return postRepository.findAllActives();
-    }
-}

src/main/java/com/cubetiqs/demo/service/UserNotFoundException.java

@@ -1,7 +0,0 @@
-package com.cubetiqs.demo.service;
-
-public class UserNotFoundException extends Exception {
-    public UserNotFoundException(String message) {
-        super(message);
-    }
-}

src/main/java/com/cubetiqs/demo/service/UserService.java

@@ -1,14 +1,11 @@
 package com.cubetiqs.demo.service;
 
 import com.cubetiqs.demo.domain.UserEntity;
-import com.cubetiqs.demo.domain.view.UserView;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
-public interface UserService extends BaseService<UserEntity, Long> {
-    UserEntity findByEmail(String email) throws UserNotFoundException;
-    Page<UserEntity> searchByEmail(String email, Pageable pageable);
-    Page<UserView> searchByEmailAsView(String email, Pageable pageable);
+public interface UserService {
+    List<UserEntity> findAllUsers();
 }

src/main/java/com/cubetiqs/demo/service/UserServiceImpl.java

@@ -1,19 +1,14 @@
 package com.cubetiqs.demo.service;
 
 import com.cubetiqs.demo.domain.UserEntity;
-import com.cubetiqs.demo.domain.view.UserView;
-import com.cubetiqs.demo.repository.BaseRepository;
 import com.cubetiqs.demo.repository.UserRepository;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
-import java.util.Optional;
 
 @Service
-public class UserServiceImpl extends BaseServiceImpl<UserEntity, Long> implements UserService {
+public class UserServiceImpl implements UserService {
     private final UserRepository userRepository;
 
     @Autowired
@@ -22,38 +17,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserEntity, Long> implement
     }
 
     @Override
-    public BaseRepository<UserEntity, Long> getRepository() {
-        return userRepository;
-    }
-
-    @Override
-    public Page<UserEntity> findAll(Pageable pageable, String q) {
-        return null;
-    }
-
-    @Override
-    public List<UserEntity> findAllActives() {
-        return userRepository.findAllActives();
-    }
-
-    @Override
-    public UserEntity findByEmail(String email) throws UserNotFoundException {
-        Optional<UserEntity> opt = userRepository.fetchFirstByEmail(email);
-        if (opt.isPresent()) {
-            return opt.get();
-        }
-
-        throw new UserNotFoundException("user does not exists");
-    }
-
-    @Override
-    public Page<UserEntity> searchByEmail(String email, Pageable pageable) {
-        return userRepository.searchByEmail(email, pageable);
-    }
-
-    @Override
-    public Page<UserView> searchByEmailAsView(String email, Pageable pageable) {
-        Page<UserEntity> users = userRepository.searchByEmail(email, pageable);
-        return users.map(s -> new UserView(s.getId(), s.getEmail()));
+    public List<UserEntity> findAllUsers() {
+        return userRepository.findAll();
     }
 }

src/main/java/com/cubetiqs/demo/ui/HomeController.java

@@ -1,20 +0,0 @@
-package com.cubetiqs.demo.ui;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-
-@Controller
-public class HomeController {
-    @GetMapping(value = {"/index", "", "/", "/index.php"})
-    public String index(Model model) {
-        model.addAttribute("myname", "Sambo");
-        return "index";
-    }
-
-    @GetMapping(value = {"/admin/users"})
-    public String user(Model model) {
-        model.addAttribute("myname", "Sambo");
-        return "admin/users/index";
-    }
-}

src/main/java/com/cubetiqs/demo/util/StringUtils.java

@@ -1,8 +0,0 @@
-package com.cubetiqs.demo.util;
-
-public final class StringUtils {
-    public static String stringQuery(String q) {
-        return "%" + q.toLowerCase() + "%";
-    }
-}
-

src/main/resources/application-mysql.yml

@@ -7,6 +7,6 @@ spring:
       ddl-auto: update
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    username: root
-    password: root
+    username: cubetiq
+    password: Root$
     url: jdbc:mysql://192.168.0.150:3306/demo

src/main/resources/application-postgres.yml

@@ -7,6 +7,6 @@ spring:
       ddl-auto: update
   datasource:
     driver-class-name: org.postgresql.Driver
-    username: root
-    password: root
+    username: cubetiq
+    password: Root$
     url: jdbc:postgresql://${POSTGRES_HOST:192.168.0.150}:5432/demo

src/main/resources/static/js/main.js

@@ -1 +0,0 @@
-console.log("hello")

src/main/resources/templates/admin/users/index.html

@@ -1,13 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport"
-          content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
-    <meta http-equiv="X-UA-Compatible" content="ie=edge">
-    <title>Document</title>
-</head>
-<body>
-    <h1>Users</h1>
-</body>
-</html>

src/main/resources/templates/index.html

@@ -1,13 +0,0 @@
-<!doctype html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport"
-          content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
-    <meta http-equiv="X-UA-Compatible" content="ie=edge">
-    <title>Index</title>
-</head>
-<body>
-    <h1 th:text="${myname}"></h1>
-</body>
-</html>