diff --git a/.gitignore b/.gitignore index 8ec7327..df0a8a9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ .gradle build/ +data/ !gradle/wrapper/gradle-wrapper.jar !**/src/main/**/build/ !**/src/test/**/build/ diff --git a/build.gradle b/build.gradle index 7a82d78..e34e86f 100644 --- a/build.gradle +++ b/build.gradle @@ -1,20 +1,48 @@ plugins { - id 'org.springframework.boot' version '3.4.1' id 'java' + id 'org.springframework.boot' version '3.4.1' + id 'io.spring.dependency-management' version '1.1.7' } -apply plugin: 'io.spring.dependency-management' - group = 'com.homelabpulse' version = '1.0-SNAPSHOT' repositories { mavenCentral() + maven { url 'https://repo.spring.io/milestone' } + maven { url 'https://repo.spring.io/snapshot' } } dependencies { + // Spring implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-validation' + implementation 'org.springframework.boot:spring-boot-starter-actuator' + implementation platform("org.springframework.ai:spring-ai-bom:1.0.0-SNAPSHOT") + implementation 'org.springframework.ai:spring-ai-core' + implementation 'org.springframework.ai:spring-ai-ollama' + + // Mapstruct & Lombok + compileOnly 'org.projectlombok:lombok:1.18.36' + annotationProcessor 'org.projectlombok:lombok:1.18.36' + implementation 'org.mapstruct:mapstruct:1.6.3' + annotationProcessor 'org.mapstruct:mapstruct-processor:1.6.3' + implementation 'org.projectlombok:lombok-mapstruct-binding:0.2.0' + + // Database + implementation 'org.flywaydb:flyway-core' + implementation 'org.flywaydb:flyway-database-postgresql' + implementation 'org.hibernate.orm:hibernate-core' + implementation 'org.postgresql:postgresql' + + // Metrics + implementation 'io.micrometer:micrometer-registry-prometheus' + + // Testing testImplementation 'org.springframework.boot:spring-boot-starter-test' + testCompileOnly 'org.projectlombok:lombok' + testAnnotationProcessor 'org.projectlombok:lombok' testImplementation platform('org.junit:junit-bom:5.10.0') testImplementation 'org.junit.jupiter:junit-jupiter' } diff --git a/docker-compose.yaml b/docker-compose.yaml new file mode 100644 index 0000000..3bada86 --- /dev/null +++ b/docker-compose.yaml @@ -0,0 +1,11 @@ +services: + postgres: + image: postgres:17 + environment: + POSTGRES_USER: postgres + POSTGRES_PASSWORD: postgres + POSTGRES_DB: dealfinder + volumes: + - ./data/postgres:/var/lib/postgresql/data + ports: + - "5432:5432" diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 249e583..a4b76b9 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2b6f5b3..9355b41 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ -#Sun Dec 22 14:51:24 CST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 1b6c787..f5feea6 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +82,12 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,22 +134,29 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,11 +201,15 @@ if "$cygwin" || "$msys" ; then done fi -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ @@ -205,6 +217,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index ac1b06f..9b42019 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,8 +13,10 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +27,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -56,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -75,13 +78,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/src/main/java/com/homelabpulse/Application.java b/src/main/java/com/homelabpulse/Application.java index b286678..6934b98 100644 --- a/src/main/java/com/homelabpulse/Application.java +++ b/src/main/java/com/homelabpulse/Application.java @@ -2,8 +2,10 @@ package com.homelabpulse; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.data.jpa.repository.config.EnableJpaAuditing; @SpringBootApplication +@EnableJpaAuditing public class Application { public static void main(String[] args) { SpringApplication.run(Application.class, args); diff --git a/src/main/java/com/homelabpulse/config/OllamaConfig.java b/src/main/java/com/homelabpulse/config/OllamaConfig.java new file mode 100644 index 0000000..d2173e2 --- /dev/null +++ b/src/main/java/com/homelabpulse/config/OllamaConfig.java @@ -0,0 +1,23 @@ +package com.homelabpulse.config; + +import org.springframework.ai.chat.model.ChatModel; +import org.springframework.ai.ollama.OllamaChatModel; +import org.springframework.ai.ollama.api.OllamaApi; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class OllamaConfig { + @Value("${dealfinder.ollama.baseUrl:http://localhost:11434}") + private String baseUrl; + + @Bean + public ChatModel chatModel() { + OllamaApi api = new OllamaApi(baseUrl); + return OllamaChatModel.builder() + .ollamaApi(api) + .build(); + } + +} diff --git a/src/main/java/com/homelabpulse/config/RestControllerConfig.java b/src/main/java/com/homelabpulse/config/RestControllerConfig.java new file mode 100644 index 0000000..71a5fd3 --- /dev/null +++ b/src/main/java/com/homelabpulse/config/RestControllerConfig.java @@ -0,0 +1,15 @@ +package com.homelabpulse.config; + +import jakarta.persistence.EntityNotFoundException; +import org.springframework.context.annotation.Configuration; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.ExceptionHandler; + +@Configuration +public class RestControllerConfig { + @ExceptionHandler(EntityNotFoundException.class) + public ResponseEntity handleEntityNotFoundException(EntityNotFoundException ex) { + return new ResponseEntity<>(ex.getMessage(), HttpStatus.NOT_FOUND); + } +} diff --git a/src/main/java/com/homelabpulse/controller/BlogController.java b/src/main/java/com/homelabpulse/controller/BlogController.java new file mode 100644 index 0000000..ef2f534 --- /dev/null +++ b/src/main/java/com/homelabpulse/controller/BlogController.java @@ -0,0 +1,46 @@ +package com.homelabpulse.controller; + +import com.homelabpulse.dto.BlogDTO; +import com.homelabpulse.service.BlogService; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/blogs") +public class BlogController { + private final BlogService blogService; + + @PostMapping + public ResponseEntity save(@RequestBody BlogDTO blogDTO) { + return new ResponseEntity<>(blogService.save(blogDTO), HttpStatus.CREATED); + } + + @GetMapping + public ResponseEntity> getAll() { + List blogs = blogService.getAll(); + return blogs.isEmpty() ? ResponseEntity.noContent().build() : ResponseEntity.ok(blogs); + } + + @GetMapping("/{id}") + public ResponseEntity getById(@PathVariable("id") Long id) { + BlogDTO blogDto = blogService.getById(id); + if (blogDto == null) { + return ResponseEntity.notFound().build(); + } + return ResponseEntity.ok(blogDto); + } + + @DeleteMapping("/{id}") + public ResponseEntity deleteById(@PathVariable("id") Long id) { + BlogDTO blogDTO = blogService.deleteById(id); + if (blogDTO == null) { + return ResponseEntity.notFound().build(); + } + return new ResponseEntity<>(blogDTO, HttpStatus.NO_CONTENT); + } +} diff --git a/src/main/java/com/homelabpulse/controller/ProductController.java b/src/main/java/com/homelabpulse/controller/ProductController.java new file mode 100644 index 0000000..70ac2ed --- /dev/null +++ b/src/main/java/com/homelabpulse/controller/ProductController.java @@ -0,0 +1,46 @@ +package com.homelabpulse.controller; + +import com.homelabpulse.dto.ProductDTO; +import com.homelabpulse.service.ProductService; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/products") +public class ProductController { + private final ProductService productService; + + @PostMapping + public ResponseEntity save(@RequestBody ProductDTO productDTO) { + return new ResponseEntity<>(productService.save(productDTO), HttpStatus.CREATED); + } + + @GetMapping + public ResponseEntity> getAll() { + List products = productService.getAll(); + return products.isEmpty() ? ResponseEntity.noContent().build() : ResponseEntity.ok(products); + } + + @GetMapping("/{id}") + public ResponseEntity getById(@PathVariable("id") Long id) { + ProductDTO productDto = productService.getById(id); + if (productDto == null) { + return ResponseEntity.notFound().build(); + } + return ResponseEntity.ok(productDto); + } + + @DeleteMapping("/{id}") + public ResponseEntity deleteById(@PathVariable("id") Long id) { + ProductDTO productDTO = productService.deleteById(id); + if (productDTO == null) { + return ResponseEntity.notFound().build(); + } + return new ResponseEntity<>(productDTO, HttpStatus.NO_CONTENT); + } +} diff --git a/src/main/java/com/homelabpulse/dto/AuditableDTO.java b/src/main/java/com/homelabpulse/dto/AuditableDTO.java new file mode 100644 index 0000000..b765c28 --- /dev/null +++ b/src/main/java/com/homelabpulse/dto/AuditableDTO.java @@ -0,0 +1,13 @@ +package com.homelabpulse.dto; + +import lombok.Getter; +import lombok.Setter; + +import java.time.LocalDateTime; + +@Getter +@Setter +public class AuditableDTO { + private LocalDateTime createdAt; + private LocalDateTime updatedAt; +} diff --git a/src/main/java/com/homelabpulse/dto/BlogDTO.java b/src/main/java/com/homelabpulse/dto/BlogDTO.java new file mode 100644 index 0000000..2ff42cc --- /dev/null +++ b/src/main/java/com/homelabpulse/dto/BlogDTO.java @@ -0,0 +1,16 @@ +package com.homelabpulse.dto; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class BlogDTO extends AuditableDTO { + private Long id; + private Long productId; + private String content; +} diff --git a/src/main/java/com/homelabpulse/dto/ProductDTO.java b/src/main/java/com/homelabpulse/dto/ProductDTO.java new file mode 100644 index 0000000..b62e5de --- /dev/null +++ b/src/main/java/com/homelabpulse/dto/ProductDTO.java @@ -0,0 +1,17 @@ +package com.homelabpulse.dto; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class ProductDTO extends AuditableDTO { + private Long id; + private String url; + private String title; + private String description; +} diff --git a/src/main/java/com/homelabpulse/entity/AuditableEntity.java b/src/main/java/com/homelabpulse/entity/AuditableEntity.java new file mode 100644 index 0000000..55e79d2 --- /dev/null +++ b/src/main/java/com/homelabpulse/entity/AuditableEntity.java @@ -0,0 +1,21 @@ +package com.homelabpulse.entity; + +import jakarta.persistence.Column; +import jakarta.persistence.MappedSuperclass; +import lombok.Data; +import org.hibernate.annotations.CreationTimestamp; +import org.hibernate.annotations.UpdateTimestamp; + +import java.time.LocalDateTime; + +@Data +@MappedSuperclass +public class AuditableEntity { + @CreationTimestamp + @Column(name = "created_at", updatable = false) + private LocalDateTime createdAt; + + @UpdateTimestamp + @Column(name = "updated_at") + private LocalDateTime updatedAt; +} diff --git a/src/main/java/com/homelabpulse/entity/Blog.java b/src/main/java/com/homelabpulse/entity/Blog.java new file mode 100644 index 0000000..4cb667f --- /dev/null +++ b/src/main/java/com/homelabpulse/entity/Blog.java @@ -0,0 +1,22 @@ +package com.homelabpulse.entity; + +import jakarta.persistence.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@Data +@Entity +@Table(name = "blog") +@EqualsAndHashCode(callSuper = true) +public class Blog extends AuditableEntity { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "id", nullable = false, updatable = false) + private Long id; + + @Column(name = "product_id") + private Long productId; + + @Column(name = "content") + private String content; +} diff --git a/src/main/java/com/homelabpulse/entity/Product.java b/src/main/java/com/homelabpulse/entity/Product.java new file mode 100644 index 0000000..be19b08 --- /dev/null +++ b/src/main/java/com/homelabpulse/entity/Product.java @@ -0,0 +1,25 @@ +package com.homelabpulse.entity; + +import jakarta.persistence.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@Data +@Entity +@Table(name = "product") +@EqualsAndHashCode(callSuper = true) +public class Product extends AuditableEntity { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "id", nullable = false, updatable = false) + private Long id; + + @Column(name = "url", nullable = false, length = 500, unique = true) + private String url; + + @Column(name = "title", nullable = false) + private String title; + + @Column(name = "description") + private String description; +} diff --git a/src/main/java/com/homelabpulse/mapper/BlogMapper.java b/src/main/java/com/homelabpulse/mapper/BlogMapper.java new file mode 100644 index 0000000..8066e76 --- /dev/null +++ b/src/main/java/com/homelabpulse/mapper/BlogMapper.java @@ -0,0 +1,11 @@ +package com.homelabpulse.mapper; + +import com.homelabpulse.dto.BlogDTO; +import com.homelabpulse.entity.Blog; +import org.mapstruct.Mapper; + +@Mapper(componentModel = "spring") +public interface BlogMapper { + BlogDTO toDTO(Blog blog); + Blog toEntity(BlogDTO blogDTO); +} diff --git a/src/main/java/com/homelabpulse/mapper/ProductMapper.java b/src/main/java/com/homelabpulse/mapper/ProductMapper.java new file mode 100644 index 0000000..e8a47bf --- /dev/null +++ b/src/main/java/com/homelabpulse/mapper/ProductMapper.java @@ -0,0 +1,11 @@ +package com.homelabpulse.mapper; + +import com.homelabpulse.dto.ProductDTO; +import com.homelabpulse.entity.Product; +import org.mapstruct.Mapper; + +@Mapper(componentModel = "spring") +public interface ProductMapper { + ProductDTO toDTO(Product product); + Product toEntity(ProductDTO productDTO); +} diff --git a/src/main/java/com/homelabpulse/repository/BlogRepository.java b/src/main/java/com/homelabpulse/repository/BlogRepository.java new file mode 100644 index 0000000..6655802 --- /dev/null +++ b/src/main/java/com/homelabpulse/repository/BlogRepository.java @@ -0,0 +1,9 @@ +package com.homelabpulse.repository; + +import com.homelabpulse.entity.Blog; +import org.springframework.data.repository.ListCrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface BlogRepository extends ListCrudRepository { +} diff --git a/src/main/java/com/homelabpulse/repository/ProductRepository.java b/src/main/java/com/homelabpulse/repository/ProductRepository.java new file mode 100644 index 0000000..390a96b --- /dev/null +++ b/src/main/java/com/homelabpulse/repository/ProductRepository.java @@ -0,0 +1,9 @@ +package com.homelabpulse.repository; + +import com.homelabpulse.entity.Product; +import org.springframework.data.repository.ListCrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface ProductRepository extends ListCrudRepository { +} diff --git a/src/main/java/com/homelabpulse/service/BlogService.java b/src/main/java/com/homelabpulse/service/BlogService.java new file mode 100644 index 0000000..6af0dd7 --- /dev/null +++ b/src/main/java/com/homelabpulse/service/BlogService.java @@ -0,0 +1,41 @@ +package com.homelabpulse.service; + +import com.homelabpulse.dto.BlogDTO; +import com.homelabpulse.entity.Blog; +import com.homelabpulse.mapper.BlogMapper; +import com.homelabpulse.repository.BlogRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Optional; + +@Service +@RequiredArgsConstructor +public class BlogService { + private final BlogRepository blogRepository; + private final BlogMapper blogMapper; + + public BlogDTO save(BlogDTO blogDTO) { + Blog newBlog = blogMapper.toEntity(blogDTO); + Blog blog = blogRepository.save(newBlog); + return blogMapper.toDTO(blog); + } + + public List getAll() { + List blogs = blogRepository.findAll(); + return blogs.stream().map(blogMapper::toDTO).toList(); + } + + public BlogDTO getById(Long id) { + Optional blogOpt = blogRepository.findById(id); + return blogOpt.map(blogMapper::toDTO).orElse(null); + } + + public BlogDTO deleteById(Long id) { + Optional blogOpt = blogRepository.findById(id); + BlogDTO blogDto = blogOpt.map(blogMapper::toDTO).orElse(null); + blogOpt.ifPresent(blogRepository::delete); + return blogDto; + } +} diff --git a/src/main/java/com/homelabpulse/service/ProductService.java b/src/main/java/com/homelabpulse/service/ProductService.java new file mode 100644 index 0000000..b35f36d --- /dev/null +++ b/src/main/java/com/homelabpulse/service/ProductService.java @@ -0,0 +1,41 @@ +package com.homelabpulse.service; + +import com.homelabpulse.dto.ProductDTO; +import com.homelabpulse.entity.Product; +import com.homelabpulse.mapper.ProductMapper; +import com.homelabpulse.repository.ProductRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Optional; + +@Service +@RequiredArgsConstructor +public class ProductService { + private final ProductRepository productRepository; + private final ProductMapper productMapper; + + public ProductDTO save(ProductDTO productDTO) { + Product newProduct = productMapper.toEntity(productDTO); + Product product = productRepository.save(newProduct); + return productMapper.toDTO(product); + } + + public List getAll() { + List products = productRepository.findAll(); + return products.stream().map(productMapper::toDTO).toList(); + } + + public ProductDTO getById(Long id) { + Optional productOpt = productRepository.findById(id); + return productOpt.map(productMapper::toDTO).orElse(null); + } + + public ProductDTO deleteById(Long id) { + Optional productOpt = productRepository.findById(id); + ProductDTO productDto = productOpt.map(productMapper::toDTO).orElse(null); + productOpt.ifPresent(productRepository::delete); + return productDto; + } +} diff --git a/src/main/resources/application-local.properties b/src/main/resources/application-local.properties new file mode 100644 index 0000000..0d67dcd --- /dev/null +++ b/src/main/resources/application-local.properties @@ -0,0 +1,8 @@ +spring.datasource.url=jdbc:postgresql://localhost:5432/dealfinder +spring.datasource.username=postgres +spring.datasource.password=postgres +spring.jpa.show-sql = true + +logging.level.org.flywaydb=DEBUG + +dealfinder.ollama.baseUrl=http://10.0.0.254:11434 \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 0000000..5bdebd5 --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1,9 @@ +spring.datasource.driverClassName = org.postgresql.Driver + +spring.flyway.enabled=true +spring.flyway.locations=classpath:db/migration +spring.flyway.baseline-on-migrate=true +spring.flyway.out-of-order=true +spring.flyway.validate-on-migrate=true + +management.endpoints.web.exposure.include=info,health,prometheus \ No newline at end of file diff --git a/src/main/resources/db/migration/V0__Create_Audit_Trigger_Function.sql b/src/main/resources/db/migration/V0__Create_Audit_Trigger_Function.sql new file mode 100644 index 0000000..cc4635f --- /dev/null +++ b/src/main/resources/db/migration/V0__Create_Audit_Trigger_Function.sql @@ -0,0 +1,4 @@ +-- V0__Create_Audit_Trigger_Function.sql + +CREATE OR REPLACE FUNCTION update_updated_at_column() +RETURNS TRIGGER AS $$ BEGIN NEW.updated_at = CURRENT_TIMESTAMP; RETURN NEW; END; $$ LANGUAGE plpgsql; diff --git a/src/main/resources/db/migration/V1__Create_Product_Table.sql b/src/main/resources/db/migration/V1__Create_Product_Table.sql new file mode 100644 index 0000000..3c099da --- /dev/null +++ b/src/main/resources/db/migration/V1__Create_Product_Table.sql @@ -0,0 +1,15 @@ +-- V1__Create_Product_Table.sql + +CREATE TABLE product ( + id BIGSERIAL PRIMARY KEY, + url VARCHAR(500) NOT NULL UNIQUE, + title VARCHAR NOT NULL, + description VARCHAR, + created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP, + updated_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP +); + +CREATE TRIGGER set_updated_at_trigger +BEFORE UPDATE ON product +FOR EACH ROW +EXECUTE FUNCTION update_updated_at_column(); diff --git a/src/main/resources/db/migration/V2__Create_Blog_Table.sql b/src/main/resources/db/migration/V2__Create_Blog_Table.sql new file mode 100644 index 0000000..10ea916 --- /dev/null +++ b/src/main/resources/db/migration/V2__Create_Blog_Table.sql @@ -0,0 +1,15 @@ +-- V2__Create_Blog_Table.sql + +CREATE TABLE blog ( + id BIGSERIAL PRIMARY KEY, + content VARCHAR, + product_id BIGSERIAL, + created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP, + updated_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP, + FOREIGN KEY (product_id) REFERENCES product(id) +); + +CREATE TRIGGER set_updated_at_trigger +BEFORE UPDATE ON blog +FOR EACH ROW +EXECUTE FUNCTION update_updated_at_column();