Salem B.

pom.xml

@@ -68,6 +68,13 @@
 			<artifactId>jackson-core</artifactId>
 			<version>3.2.0</version>
 		</dependency>
+
+		<dependency>
+			<groupId>software.amazon.awssdk</groupId>
+			<artifactId>s3</artifactId>
+			<version>2.25.0</version>
+		</dependency>
+
 	</dependencies>
 
 	<build>

src/main/java/net/hackyourfuture/hyfshop/configuration/B2Config.java

@@ -0,0 +1,41 @@
+package net.hackyourfuture.hyfshop.configuration;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.s3.presigner.S3Presigner;
+
+import java.net.URI;
+
+@Configuration
+public class B2Config {
+
+    @Value("${b2.endpoint}") private String endpoint;
+    @Value("${b2.region}")   private String region;
+    @Value("${b2.access-key}") private String accessKey;
+    @Value("${b2.secret-key}") private String secretKey;
+
+    @Bean
+    public S3Client s3Client() {
+        return S3Client.builder()
+                .credentialsProvider(StaticCredentialsProvider.create(
+                        AwsBasicCredentials.create(accessKey, secretKey)))
+                .endpointOverride(URI.create(endpoint))
+                .region(Region.of(region))
+                .build();
+    }
+
+    @Bean
+    public S3Presigner s3Presigner() {
+        return S3Presigner.builder()
+                .credentialsProvider(StaticCredentialsProvider.create(
+                        AwsBasicCredentials.create(accessKey, secretKey)))
+                .endpointOverride(URI.create(endpoint))
+                .region(Region.of(region))
+                .build();
+    }
+}

src/main/java/net/hackyourfuture/hyfshop/file/FileService.java

@@ -0,0 +1,62 @@
+package net.hackyourfuture.hyfshop.file;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+import software.amazon.awssdk.core.sync.RequestBody;
+import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.s3.model.DeleteObjectRequest;
+import software.amazon.awssdk.services.s3.model.PutObjectRequest;
+import software.amazon.awssdk.services.s3.presigner.S3Presigner;
+
+import java.util.UUID;
+
+@Service
+public class FileService {
+
+    private final S3Client s3Client;
+    private final S3Presigner s3Presigner;
+
+    @Value("${b2.bucket}")
+    private String bucket;
+
+    @Value("${b2.endpoint}")
+    private String endpoint;
+
+    public FileService(S3Client s3Client, S3Presigner s3Presigner) {
+        this.s3Client = s3Client;
+        this.s3Presigner = s3Presigner;
+    }
+
+
+    public String upload(MultipartFile file) throws Exception {
+        String key = UUID.randomUUID().toString() + "-" + file.getOriginalFilename();
+
+        s3Client.putObject(
+                PutObjectRequest.builder()
+                        .bucket(bucket)
+                        .key(key)
+                        .contentType(file.getContentType())
+                        .build(),
+                RequestBody.fromInputStream(file.getInputStream(), file.getSize())
+        );
+
+        return endpoint + "/file/" + bucket + "/" + key;
+    }
+
+
+    public void deleteByUrl(String imageUrl) {
+        if (imageUrl == null || imageUrl.isEmpty()) {
+            return;
+        }
+
+        String key = imageUrl.substring(imageUrl.lastIndexOf("/") + 1);
+
+        s3Client.deleteObject(
+                DeleteObjectRequest.builder()
+                        .bucket(bucket)
+                        .key(key)
+                        .build()
+        );
+    }
+}

src/main/java/net/hackyourfuture/hyfshop/product/Product.java

@@ -6,6 +6,7 @@
 import lombok.Setter;
 
 import java.math.BigDecimal;
+import java.util.Map;
 
 @AllArgsConstructor
 @NoArgsConstructor
@@ -17,4 +18,5 @@ public class Product {
     private BigDecimal price;
     private String category;
     private String imageUrl;
+    private Map<String, Object> details;
 }

src/main/java/net/hackyourfuture/hyfshop/product/ProductRepository.java

@@ -1,15 +1,21 @@
 package net.hackyourfuture.hyfshop.product;
 
 import lombok.AllArgsConstructor;
+import net.hackyourfuture.hyfshop.product.dto.ProductResponse;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.jdbc.core.simple.JdbcClient;
 import org.springframework.stereotype.Repository;
+import tools.jackson.core.type.TypeReference;
+import tools.jackson.databind.ObjectMapper;
+
 import java.util.List;
+import java.util.Map;
 
 @Repository
 @AllArgsConstructor
 public class ProductRepository {
     private final JdbcClient jdbcClient;
+    private static final ObjectMapper objectMapper = new ObjectMapper();
 
     public static final RowMapper<Product> PRODUCT_ROW_MAPPER = (rs, _) -> {
         var product = new Product();
@@ -18,20 +24,29 @@ public class ProductRepository {
         product.setPrice(rs.getBigDecimal("price"));
         product.setCategory(rs.getString("category"));
         product.setImageUrl(rs.getString("image_url"));
+        try {
+            String json = rs.getString("details");
+            if (json != null) {
+                product.setDetails(objectMapper.readValue(json,
+                        new TypeReference<Map<String, Object>>() {}));
+            }
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
         return product;
     };
 
     public List<Product> getAllProducts() {
         return jdbcClient
-                .sql("SELECT id, title, price, category, image_url FROM products")
+                .sql("SELECT * FROM products")
                 .query(PRODUCT_ROW_MAPPER)
                 .list();
 
     }
 
     public Product findById(int id) {
         return jdbcClient
-                .sql("SELECT id, title, price, category, image_url FROM products WHERE id = :id")
+                .sql("SELECT * FROM products WHERE id = :id")
                 .param("id", id)
                 .query(PRODUCT_ROW_MAPPER)
                 .single();
@@ -49,12 +64,18 @@ public void setImageUrl(int id, String imageUrl) {
     }
 
     public List<Product> findByColor(String color) {
-        // TODO: Implement
-        throw new UnsupportedOperationException("Not implemented yet");
+        return jdbcClient
+                .sql("SELECT * FROM products WHERE details @> CAST(? AS jsonb)")
+                .param("{\"color\": \"" + color + "\"}")
+                .query(PRODUCT_ROW_MAPPER)
+                .list();
     }
 
-    public Product setSize(int id, String size) {
-        // TODO: Implement
-        throw new UnsupportedOperationException("Not implemented yet");
+    public void setSize(int id, String size) {
+        jdbcClient.
+                sql("UPDATE products SET details = jsonb_set(details, '{size}', ?::jsonb) WHERE id = ?")
+                .param("\"" + size + "\"")
+                .param(id)
+                .update();
     }
 }

src/main/java/net/hackyourfuture/hyfshop/product/ProductService.java

@@ -1,6 +1,7 @@
 package net.hackyourfuture.hyfshop.product;
 
 import lombok.RequiredArgsConstructor;
+import net.hackyourfuture.hyfshop.file.FileService;
 import net.hackyourfuture.hyfshop.product.dto.ProductResponse;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
@@ -11,6 +12,7 @@
 @RequiredArgsConstructor
 public class ProductService {
     private final ProductRepository productRepository;
+    private final FileService fileService;
 
     public List<ProductResponse> getAllProducts() {
         return productRepository.getAllProducts().stream().map(ProductResponse::from).toList();
@@ -26,14 +28,32 @@ public ProductResponse setProductSize(int id, String size) {
     }
 
     public ProductResponse setProductImage(int id, MultipartFile file) {
-        // TODO: Implement
-        // call ProductRepository.setImageUrl() afterwards with the new URL
-        throw new UnsupportedOperationException("Not implemented yet");
+        try {
+            Product product = productRepository.findById(id);
+            if (product.getImageUrl() != null) {
+                fileService.deleteByUrl(product.getImageUrl());
+            }
+            String imageUrl = fileService.upload(file);
+            productRepository.setImageUrl(id, imageUrl);
+
+            Product updatedProduct = productRepository.findById(id);
+            return ProductResponse.from(updatedProduct);
+
+        } catch (Exception e) {
+            throw new RuntimeException("Failed to upload product image", e);
+        }
     }
 
     public ProductResponse deleteProductImage(int id) {
-        // TODO: Implement
-        // call ProductRepository.setImageUrl() to set the image url to null
-        throw new UnsupportedOperationException("Not implemented yet");
+        Product product = productRepository.findById(id);
+
+        if (product.getImageUrl() != null) {
+            fileService.deleteByUrl(product.getImageUrl());
+        }
+
+        productRepository.setImageUrl(id, null);
+
+        Product updatedProduct = productRepository.findById(id);
+        return ProductResponse.from(updatedProduct);
     }
 }

src/main/java/net/hackyourfuture/hyfshop/product/dto/ProductResponse.java

@@ -3,21 +3,24 @@
 import net.hackyourfuture.hyfshop.product.Product;
 
 import java.math.BigDecimal;
+import java.util.Map;
 
 public record ProductResponse (
         int id,
         String title,
         BigDecimal price,
         String category,
-        String imageUrl
+        String imageUrl,
+        Map<String, Object> details
 ){
     public static ProductResponse from(Product product) {
         return new ProductResponse(
                 product.getId(),
                 product.getTitle(),
                 product.getPrice(),
                 product.getCategory(),
-                product.getImageUrl()
+                product.getImageUrl(),
+                product.getDetails()
         );
     }
 }

src/main/resources/application.yaml

@@ -7,3 +7,14 @@ spring:
     password: '${DB_PASSWORD}'
 server:
   port: '8080'
+sql:
+  init:
+    # runs schema.sql automatically every time the app starts
+    mode: always
+
+b2:
+  endpoint: https://s3.eu-central-003.backblazeb2.com
+  region: eu-central-003
+  access-key: B2_ACCESS_KEY
+  secret-key: B2_SECRET_KEY
+  bucket: hyfshop