final 0.0.5

Dockerfile

@@ -34,6 +34,8 @@
 #ENTRYPOINT ["java", "org.springframework.boot.loader.JarLauncher"]
 
 
+
+
 ##Maven Build
 #FROM  maven:3.8.3-openjdk-17  AS builder
 #COPY pom.xml /app/

README.md

@@ -11,5 +11,3 @@ JWT_SECRET_KEY=jwt_key
 JWT_EXPIRATION=86400000 # a day
 JWT_REFRESH_EXPIRATION=2592000000 # 30 day
 ```
-=======
-#datum

pom.xml

@@ -44,6 +44,13 @@
             <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
             <version>2.2.0</version>
         </dependency>
+
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-boot-starter</artifactId>
+            <version>3.0.0</version>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context-support</artifactId>

src/main/java/datum/Main.java

@@ -8,12 +8,19 @@
 import jakarta.annotation.PostConstruct;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
 import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.web.servlet.function.RouterFunction;
+import org.springframework.web.servlet.function.ServerResponse;
 
+import java.net.URI;
 import java.util.Random;
 import java.util.TimeZone;
 import java.util.regex.Pattern;
 
+import static org.springframework.web.servlet.function.RequestPredicates.GET;
+import static org.springframework.web.servlet.function.RouterFunctions.route;
+
 @SpringBootApplication
 public class Main {
     public static final Random random = new Random();

src/main/java/datum/app/Demo.java

@@ -20,97 +20,13 @@
 @RequestMapping("/TEST")
 @RequiredArgsConstructor
 public class Demo {
-//    private final PersonRepository personRepository;
 
     @GetMapping
     public ResponseEntity<Object> get(
             HttpServletRequest request,
             HttpServletResponse response
     ) {
-//        Map<String, Object> map = new HashMap<>();
-//        map.put("getMethod", request.getMethod());
-//        map.put("getPathInfo", request.getPathInfo());
-//        map.put("getServletPath", request.getServletPath());
-//        map.put("getContextPath", request.getContextPath());
-//        map.put("getRequestURI", request.getRequestURI());
-//        map.put("getRequestURL", request.getRequestURL());
-//        map.put("getPathTranslated", request.getPathTranslated());
-//
-//        return ResponseEntity.ok(map);
         return ResponseEntity.ok(Map.of(1, "Hello, Get!"));
     }
-//
-//    @PostMapping
-//    public ResponseEntity<Object> post(
-//            HttpServletRequest request,
-//            HttpServletResponse response
-//    ) {
-////        List<Person> persons = List.of(
-////                Person.builder().firstname("person1").build(),
-////                Person.builder().firstname("person2").build()
-////        );
-////        personRepository.saveAll(persons);
-////        persons.get(0).setDeleted(true);
-////        personRepository.save(persons.get(0));
-////        var persons2 = personRepository.findAll();
-////        return ResponseEntity.ok(List.of(persons, persons2));
-//        return ResponseEntity.ok("Hello, Post!");
-//    }
-//
-//    @PutMapping
-//    public ResponseEntity<Object> put(
-//            HttpServletRequest request,
-//            HttpServletResponse response
-//    ) {
-//        return ResponseEntity.ok("Hello, Put!");
-//    }
-//
-//    @DeleteMapping
-//    public ResponseEntity<Object> delete(
-//            HttpServletRequest request,
-//            HttpServletResponse response
-//    ) {
-//        return ResponseEntity.ok("Hello, Delete!");
-//    }
-//
-//    @PatchMapping("/{var}/{id}")
-//    public ResponseEntity<Object> patch(
-//            HttpServletRequest request,
-//            HttpServletResponse response,
-//            @PathVariable("var") String var,
-//            @PathVariable("id") String id
-//    ) {
-//        return ResponseEntity.ok("Hello, " + var + " " + id);
-//////        UrlPathHelper
-////        Map<String, Object> map = new HashMap<>();
-////        map.put("var", var);
-////        map.put("id", id);
-////        map.put("getMethod", request.getMethod());
-////        map.put("getPathInfo", request.getPathInfo());
-////        map.put("getServletPath", request.getServletPath());
-////        map.put("getContextPath", request.getContextPath());
-////        map.put("getRequestURI", request.getRequestURI());
-////        map.put("getRequestURL", request.getRequestURL());
-////        map.put("getPathTranslated", request.getPathTranslated());
-////        map.put("getRemoteUser", request.getRemoteUser());
-////        map.put("getHttpServletMapping", request.getHttpServletMapping());
-////        map.put("getQueryString", request.getQueryString());
-////        map.put("getScheme", request.getScheme());
-////        map.put("getTrailerFields", request.getTrailerFields());
-////        map.put("getParameterMap", request.getParameterMap());
-////        map.put("getProtocol", request.getProtocol());
-////        map.put("getAttributeNames", request.getAttributeNames());
-////        map.put("getAttribute",  request.getAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE));
-//
-//
-////        return ResponseEntity.ok(map);
-//    }
-//
-//    public ResponseEntity<Object> test(
-//            HttpServletRequest request,
-//            HttpServletResponse response
-//    ) {
-//        return ResponseEntity.ok("Hello, Patch!");
-//    }
 }
 

src/main/java/datum/app/admin/dto/PersonDTO.java

@@ -19,7 +19,6 @@
 @NoArgsConstructor
 @ToString
 @Jacksonized
-//@Schema(description = "Информация о человеке")
 @Schema
 public class PersonDTO implements Serializable {
 

src/main/java/datum/authenticate/UserRepository.java

@@ -22,27 +22,22 @@ public interface UserRepository extends JpaRepository<User, Long> {
 //    boolean existsByEmailIgnoreCaseAndCodeIsNull(String email);
 //    boolean existsByEmailIgnoreCaseAndCodeIsNullAndLockedFalse(String email);
 
-//      @Transactional
     @Modifying
     @Query("UPDATE User a SET a.enabled = TRUE, a.locked=FALSE, a.code = NULL WHERE a.email = ?1 AND a.code = ?2")
     void updateUserByEmailAndCode(String email, Integer code);
 
-//    @Transactional
         @Modifying
     @Query("UPDATE User a SET a.enabled = TRUE, a.locked=FALSE, a.code = NULL WHERE a.email = ?1")
     void enableUserByEmail(String email);
 
-//@Transactional
         @Modifying
     @Query("UPDATE User u SET u.password = null WHERE u.email = ?1 AND u.code = ?2")
     boolean updateUserPasswordByEmailIgnoreCaseAndCode(String email, Integer code);
 
-//    @Transactional
         @Modifying
     @Query("UPDATE User u SET u.password = ?1 WHERE u.email = ?2")
     boolean updateUserPasswordByEmailIgnoreCase(String password, String email);
 
-//    @Transactional
         @Modifying
     @Query("UPDATE User u SET u.password = ?1 WHERE u.email = ?2 AND u.password IS NULL")
     boolean updatePasswordByEmail(String password, String email);

src/main/java/datum/config/OpenApiConfig.java

@@ -13,16 +13,16 @@
 @OpenAPIDefinition(
         info = @Info(
 //                contact = @Contact(
-//                        name = "Alibou",
-//                        email = "contact@aliboucoding.com",
-//                        url = "https://aliboucoding.com/course"
+//                        name = "name",
+//                        email = "contact@gmail.com",
+//                        url = "https://example.com/"
 //                ),
                 description = "datum crm system",
                 title = "datum",
                 version = "1.0",
 //                license = @License(
 //                        name = "Licence name",
-//                        url = "https://some-url.com"
+//                        url = "https://eaxmple.com"
 //                ),
                 termsOfService = "http://swagger.io/terms/"
         ),

src/main/java/datum/config/SecurityConfiguration.java

@@ -42,7 +42,9 @@ public class SecurityConfiguration {
             "/AUTHENTICATE/**",
             "/TEST",
             "/TEST/**",
-            "/v2/api-docs",
+            "/api",
+            "/api/**",
+            "/doc",
             "/v3/api-docs",
             "/v3/api-docs/**",
             "/swagger-resources",

src/main/resources/application.yml

@@ -42,4 +42,32 @@ application:
       secret_key: ${JWT_SECRET_KEY}
       expiration: ${JWT_EXPIRATION}
       refresh-token:
-        expiration: ${JWT_REFRESH_EXPIRATION}
+        expiration: ${JWT_REFRESH_EXPIRATION}
+#springdoc:
+#  api-docs:
+#    path: /doc
+#  swagger-ui:
+#    path: /api
+
+
+#springfox:
+#  documentation:
+#    swaggerUi:
+#      baseUrl: /api
+#    openApi:
+#      v3:
+#        path: /doc
+#    swagger:
+#      v2:
+#        path: /doc2
+
+#springfox:
+#  documentation:
+#    swagger-ui:
+#      base-url: /api
+#    openapi:
+#      v3:
+#        path: /doc
+#    swagger:
+#      v2:
+#        path: /doc2

src/main/resources/liquibase.yml

@@ -1,18 +1,20 @@
 spring:
   liquibase:
     change-log: classpath:db/changelog/db.changelog-master.yml
-url: jdbc:postgresql://localhost:5432/datum
+url: jdbc:postgresql://${DB_URL}:${DB_PORT}/${DB_DATABASE}
 username: postgres
 password: postgres
 driver: org.postgresql.Driver
 changeLogFile: src/main/resources/db/changelog/db.changelog-master.yml
 outputChangeLogFile: src/main/resources/db/changelog/changelog-output.yml
 
-referenceDriver: liquibase.ext.hibernate.database.connection.HibernateDriver
-referenceUrl: hibernate:spring:at.frink.troubleshoot?
-диалект: org.hibernate.dialect.MariaDB53Dialect&
-hibernate.physical_naming_strategy: org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy&
-hibernate.physical_implicit_naming_strategy: org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy
+#referenceDriver: liquibase.ext.hibernate.database.connection.HibernateDriver
+#referenceUrl: hibernate:spring:at.frink.troubleshoot?
+#диалект: org.hibernate.dialect.MariaDB53Dialect&
+#hibernate.physical_naming_strategy: org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy&
+#hibernate.physical_implicit_naming_strategy: org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy
+
+
 #referenceUrl: jdbc:postgresql://localhost:5432/datum
 #referenceDriver: org.postgresql.Driver
 #referenceUsername: postgres