Add postgresql support to pom, create sample stack 4 docker

.gitignore

@@ -1,3 +1,5 @@
-postgres/docker-compose.yml
+docker/deloyment-example/files/library/*
+docker/deloyment-example/files/postgresql/*
+docker/deloyment-example/files/root/*
 target/
-lib/
+lib/

.vscode/launch.json

@@ -2,13 +2,23 @@
     "configurations": [
         {
             "type": "java",
-            "name": "Spring Boot-MarinescoApplication<marinesco>",
+            "name": "Marinesco DEV",
             "request": "launch",
             "cwd": "${workspaceFolder}",
             "mainClass": "ru.redrise.marinesco.MarinescoApplication",
             "projectName": "marinesco",
             "args": "",
             "envFile": "${workspaceFolder}/.env"
+        },
+        {
+            "type": "java",
+            "name": "Marinesco PROD",
+            "request": "launch",
+            "cwd": "${workspaceFolder}",
+            "mainClass": "ru.redrise.marinesco.MarinescoApplication",
+            "projectName": "marinesco",
+            "args": "--spring.profiles.active=prod",
+            "envFile": "${workspaceFolder}/.env"
         }
     ]
 }

docker/deloyment-example/README.MD

@@ -0,0 +1,5 @@
+### How to
+1. Place `marinesco.jar` to `files/root/`. Rename artifact if needed.
+2. Extract `inpx`-file-containing folder into `files/library/`
+3. Optionally remove `pgadmin` section from `docker-compose.yml` file
+4. Run via `docker compose up`

docker/deloyment-example/build/Dockerfile

@@ -0,0 +1,9 @@
+FROM openjdk:21-jdk-slim
+
+ENV TZ=Europe/Moscow
+
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+
+WORKDIR /root
+
+CMD java -jar marinesco.jar

docker/deloyment-example/docker-compose.yml

@@ -0,0 +1,34 @@
+version: '3.1'
+
+services:
+    marinesco:
+        build: ./build
+        image: loper:marinesco
+        links:
+            - postgres
+        ports:
+            - 80:8080
+        volumes:
+            - ./files/root:/root
+            - ./files/library:/library
+        environment:
+            - SPRING_PROFILES_ACTIVE=prod
+        logging:
+            driver: syslog
+    postgres:
+        image: postgres
+        volumes:
+            - ./files/postgresql:/var/lib/postgresql
+        environment:
+            - POSTGRES_USER=mari
+            - POSTGRES_PASSWORD=example
+            - POSTGRES_DB=marinesco
+    pgadmin:
+        image: dpage/pgadmin4
+        links:
+            - postgres
+        ports:
+            - 3334:80
+        environment:
+            - PGADMIN_DEFAULT_EMAIL=root@srv.lan
+            - PGADMIN_DEFAULT_PASSWORD=example

pom.xml

@@ -80,6 +80,12 @@
 			<optional>true</optional>
 		</dependency>
 
+
+		<dependency>
+			<groupId>org.postgresql</groupId>
+			<artifactId>postgresql</artifactId>
+			<scope>runtime</scope>
+		</dependency>
 	</dependencies>
 
 	<build>

src/main/java/ru/redrise/marinesco/RootController.java

@@ -5,17 +5,12 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
 @Controller
 @RequestMapping("/")
 public class RootController {
 
     @GetMapping
     public String getPage(@ModelAttribute("search") String text) {
-        // TODO: SEARCH PAGE + CONTROLLER
-        log.info(text);
         return "root";
     }
 }

src/main/java/ru/redrise/marinesco/library/AuthorController.java

@@ -1,4 +1,4 @@
-package ru.redrise.marinesco;
+package ru.redrise.marinesco.library;
 
 import java.util.List;
 
@@ -10,8 +10,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 
 import ru.redrise.marinesco.data.AuthorRepository;
 import ru.redrise.marinesco.data.BookRepository;
-import ru.redrise.marinesco.library.Author;
-import ru.redrise.marinesco.library.Book;
 
 @Controller
 @RequestMapping("/author")

src/main/java/ru/redrise/marinesco/library/BookController.java

@@ -1,4 +1,4 @@
-package ru.redrise.marinesco;
+package ru.redrise.marinesco.library;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -7,7 +7,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import ru.redrise.marinesco.data.BookRepository;
-import ru.redrise.marinesco.library.Book;
 
 @Controller
 @RequestMapping("/book")

src/main/java/ru/redrise/marinesco/library/InpxScanner.java

@@ -134,22 +134,23 @@ public class InpxScanner implements Runnable {
     }
 
     private void parseInp(File inpxFile) throws Exception {
+        /*
         log.warn("REMOVE TEMPORARY SOLUTION - BREAKER");
         log.warn("REMOVE TEMPORARY SOLUTION - BREAKER");
         log.warn("REMOVE TEMPORARY SOLUTION - BREAKER");
         boolean breaker = false;
-
+        */
         try (ZipInputStream zipInputStream = new ZipInputStream(new FileInputStream(inpxFile))) {
             ZipEntry zipEntry = zipInputStream.getNextEntry();
 
             while (zipEntry != null) {
                 if (zipEntry.getName().toLowerCase().endsWith(".inp")) {
-                    // *
+                    /*
                     if (breaker) {
                         zipEntry = zipInputStream.getNextEntry();
                         continue;
                     }
-                    breaker = true;//
+                    breaker = true;
                     // */
                     byte[] content = inpToByteArray(zipInputStream, zipEntry.getSize());
                     parseInpContent(content, zipEntry.getName());

src/main/resources/application-prod.yml

@@ -0,0 +1,21 @@
+spring:
+    thymeleaf:
+        cache: true
+    datasource:
+        driver-class-name: org.postgresql.Driver  
+        url: jdbc:postgresql://postgres:5432/marinesco
+        username: mari
+        password: example
+    jpa:
+        properties:
+            hibernate:
+                database-platform: org.hibernate.dialect.PostgreSQL94Dialect
+        hibernate: 
+            ddl-auto: update
+logging:
+    level:
+        org:
+            springframework: INFO
+marinesco:
+    library:
+        filesLocation: "/library"

src/main/resources/static/styles/styles.css

@@ -156,12 +156,11 @@ header {
 	color: #74bfbd;
 }
 
-.header_entry_link:link {
+.header_entry_link:link,
-	color: #74bfbd;
-}
 .header_entry_link:visited {
 	color: #74bfbd;
 }
+
 .header_entry_link:hover {
 	color: #b6a795;
 }
@@ -175,10 +174,6 @@ header {
 	margin-right: 10px;
 }
 
-a.entry {
-	text-decoration: none;
-}
-
 .header_title {
 	font-size: 1.5em;
 }
@@ -262,9 +257,6 @@ button:hover {
 	text-shadow: -1px -1px 0 #1e1e1e, 1px -1px 0 #1e1e1e, -1px 1px 0 #1e1e1e, 1px 1px 0 #1e1e1e;
 	color: #74bfbd;
 }
-.copy_link:hover {
-	color: #b6a795;
-}
 
 /* error */
 .error {

src/main/resources/templates/book.html

@@ -21,7 +21,7 @@
                     <a th:href="${'/author/' + author.id}" th:text="${author.authorName}"></a>
                 </div>
                 <br />
-                <span th:each="genre : ${book.genres}" th:text="${(genre.humanReadableDescription == '' ? genre.genreId : genre.humanReadableDescription) + '&nbsp;&nbsp;'}"></span>
+                <span th:each="genre : ${book.genres}" th:text="${((genre.humanReadableDescription == null || genre.humanReadableDescription == '') ? genre.genreId : genre.humanReadableDescription) + '&nbsp;&nbsp;'}"></span>
                 <p>
                     <a th:href="${'/download/?container=' + book.container + '&file=' + book.fsFileName}" 
                         th:text="${'Download ' + book.fileExtension + ' (' + book.fileSizeForHumans + ')'}"></a>

src/main/resources/templates/fragments/footer.html

@@ -7,10 +7,8 @@
 <body>
   <div class="footer" th:fragment="footer">
     <div class="container">
-      <footer class="inner_footer">
+      <footer class="inner_footer copy_link">
-        <a class="entry" href="https://redrise.ru">
+        <a class="header_entry_link" href="https://redrise.ru">&copy; 2023-2024 Dmitry Isaenko</a>
-          <div class="copy_link">&copy; 2023-2024 Dmitry Isaenko</div>
-        </a>
       </footer>
     </div>
   </div>

src/main/resources/templates/fragments/header.html

@@ -14,9 +14,7 @@
           <div class="block_inner">
             <ul class="ul_right_block">
               <li class="li_header_block">
-                <a class="entry" href="/login" th:href="@{/login}">
+                <a class="header_entry header_entry_link" href="/login" th:href="@{/login}">Sign in</a>
-                  <span class="header_entry header_entry_link">Sign in</span>
-                </a>
               </li>
             </ul>
           </div>
@@ -53,9 +51,7 @@
                 <span class="header_entry">|</span>
               </li>
               <li class="li_header_block">
-                <a class="entry" href="/logout">
+                <a class="header_entry header_entry_link" href="/logout">Logout</a>
-                  <span class="header_entry header_entry_link">Logout</span>
-                </a>
                 <form style="visibility: hidden" id="form" method="post" action="#" th:action="@{/logout}"></form>
               </li>
             </ul>

src/main/resources/templates/root.html

@@ -12,11 +12,7 @@
     <div class="page">
         <div th:replace="~{fragments/header :: ${#authorization.expression('isAuthenticated()')} ? 'header-auth' : 'header-anon'}"></div>
         <div class="container base">
-            <br /><a href="/book/59992766">/book/59992766</a>
+            Welcome
-            <br /><a href="/author/1">/author/1</a>
-            <br /><a href="/h2">H2</a>
-            <br />
-            
         </div>
     </div>
     <div th:replace="~{fragments/footer :: 'footer'}"></div>