Enhanced blog-image usage

gdevxy · Nov 29, 2024 · 63cf4d6 · 63cf4d6
1 parent 3dfce20
commit 63cf4d6
Show file tree

Hide file tree

Showing 12 changed files with 62 additions and 56 deletions.
diff --git a/client/src/main/java/com/gdevxy/blog/client/contentful/ContentfulClient.java b/client/src/main/java/com/gdevxy/blog/client/contentful/ContentfulClient.java
@@ -1,5 +1,6 @@
 package com.gdevxy.blog.client.contentful;
 
+import com.gdevxy.blog.client.contentful.model.ComponentRichImage;
 import com.gdevxy.blog.client.contentful.model.FeaturedImage;
 import com.gdevxy.blog.client.contentful.model.PageBlogPost;
 import com.gdevxy.blog.client.contentful.model.PageBlogPostCollection;
@@ -12,6 +13,6 @@ public interface ContentfulClient {
 
 	PageBlogPostCollection findBlogPosts();
 
-	Optional<FeaturedImage> findImage(String id);
+	Optional<ComponentRichImage> findImage(String id);
 
 }
diff --git a/client/src/main/java/com/gdevxy/blog/client/contentful/DefaultContentfulClient.java b/client/src/main/java/com/gdevxy/blog/client/contentful/DefaultContentfulClient.java
@@ -1,19 +1,18 @@
 package com.gdevxy.blog.client.contentful;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
+import java.util.Map;
+import java.util.Optional;
+
+import jakarta.enterprise.context.ApplicationScoped;
+
 import com.gdevxy.blog.client.GraphQlQueryLoader;
 import com.gdevxy.blog.client.contentful.model.ComponentRichImage;
-import com.gdevxy.blog.client.contentful.model.FeaturedImage;
 import com.gdevxy.blog.client.contentful.model.PageBlogPost;
 import com.gdevxy.blog.client.contentful.model.PageBlogPostCollection;
 import io.smallrye.graphql.client.GraphQLClient;
 import io.smallrye.graphql.client.dynamic.api.DynamicGraphQLClient;
-import jakarta.enterprise.context.ApplicationScoped;
 import lombok.extern.slf4j.Slf4j;
 
-import java.util.Map;
-import java.util.Optional;
-
 @Slf4j
 @DefaultContentful
 @ApplicationScoped
@@ -43,11 +42,11 @@ public PageBlogPostCollection findBlogPosts() {
 	}
 
 	@Override
-	public Optional<FeaturedImage> findImage(String id) {
+	public Optional<ComponentRichImage> findImage(String id) {
 
 		var response = executeQuery(() -> queryLoader.loadQuery("find-image"), Map.of("id", id));
 
-		return Optional.ofNullable(asClass(response, ComponentRichImage.class)).map(ComponentRichImage::getImage);
+		return Optional.ofNullable(asClass(response, ComponentRichImage.class));
 	}
 
 }
diff --git a/client/src/main/java/com/gdevxy/blog/client/contentful/PreviewContentfulClient.java b/client/src/main/java/com/gdevxy/blog/client/contentful/PreviewContentfulClient.java
@@ -43,12 +43,12 @@ public PageBlogPostCollection findBlogPosts() {
 	}
 
 	@Override
-	public Optional<FeaturedImage> findImage(String id) {
+	public Optional<ComponentRichImage> findImage(String id) {
 
 		var params = Map.<String, Object>of("preview", true, "id", id);
 		var response = executeQuery(() -> queryLoader.loadQuery("find-image"), params);
 
-		return Optional.ofNullable(asClass(response, ComponentRichImage.class)).map(ComponentRichImage::getImage);
+		return Optional.ofNullable(asClass(response, ComponentRichImage.class));
 	}
 
 }
diff --git a/client/src/main/java/com/gdevxy/blog/client/contentful/model/ComponentRichImage.java b/client/src/main/java/com/gdevxy/blog/client/contentful/model/ComponentRichImage.java
@@ -13,5 +13,6 @@
 public class ComponentRichImage {
 
 	private FeaturedImage image;
+	private Boolean fullWidth;
 
 }
diff --git a/client/src/main/resources/graphql/find-image.graphql b/client/src/main/resources/graphql/find-image.graphql
@@ -7,5 +7,6 @@ query findImage($id: String!){
             height
             url
         }
+        fullWidth
     }
 }
diff --git a/component/src/main/resources/templates/blog/blog-image.html b/component/src/main/resources/templates/blog/blog-image.html
@@ -1,3 +1,7 @@
 <div class="py-4">
-    <img src="{image.url}" style="width: 100%; height: 250px; object-fit: cover; object-position: 50% 50%;" alt="{image.title}">
+    {#if image.fullWidth}
+        <img src="{image.url}" style="width: 100%; object-fit: cover; object-position: 50% 50%;" alt="{image.title}">
+    {#else}
+        <img src="{image.url}" style="width: {image.width}px; height: {image.height};" alt="{image.title}">
+    {/if}
 </div>
diff --git a/model/src/main/java/com/gdevxy/blog/model/Image.java b/model/src/main/java/com/gdevxy/blog/model/Image.java
@@ -5,7 +5,7 @@
 import lombok.ToString;
 
 @Getter
-@Builder
+@Builder(toBuilder = true)
 @ToString
 public class Image {
 
@@ -15,5 +15,6 @@ public class Image {
 	private final Integer width;
 	private final Integer height;
 	private final String contentType;
+	private final Boolean fullWidth;
 
 }
diff --git a/service/src/main/java/com/gdevxy/blog/service/contentful/blogpost/BlogPostService.java b/service/src/main/java/com/gdevxy/blog/service/contentful/blogpost/BlogPostService.java
@@ -5,6 +5,8 @@
 import com.gdevxy.blog.client.contentful.PreviewContentful;
 import com.gdevxy.blog.model.BlogPost;
 import com.gdevxy.blog.service.contentful.ContentfulServiceSupport;
+import com.gdevxy.blog.service.contentful.blogpost.converter.BlogPostConverter;
+
 import jakarta.enterprise.context.ApplicationScoped;
 
 import java.util.List;

diff --git a/...ontentful/blogpost/BlogPostConverter.java → ...blogpost/converter/BlogPostConverter.java b/...ontentful/blogpost/BlogPostConverter.java → ...blogpost/converter/BlogPostConverter.java
@@ -1,4 +1,4 @@
-package com.gdevxy.blog.service.contentful.blogpost;
+package com.gdevxy.blog.service.contentful.blogpost.converter;
 
 import com.gdevxy.blog.client.contentful.ContentfulClient;
 import com.gdevxy.blog.client.contentful.model.PageBlogPost;
@@ -9,7 +9,7 @@
 import com.gdevxy.blog.model.BlogPost;
 import com.gdevxy.blog.model.Image;
 import com.gdevxy.blog.model.contentful.Node;
-import com.gdevxy.blog.service.contentful.image.ImageConverter;
+
 import jakarta.annotation.Nullable;
 import jakarta.enterprise.context.ApplicationScoped;
 import lombok.RequiredArgsConstructor;
@@ -25,6 +25,7 @@
 public class BlogPostConverter {
 
 	private final ImageConverter imageConverter;
+	private final RichImageConverter richImageConverter;
 
 	public BlogPost convert(PageBlogPost p) {
 
@@ -94,7 +95,7 @@ private Optional<Image> toImage(@Nullable ContentfulClient client, Node nodeType
 			return Optional.empty();
 		}
 
-		return client.findImage(embeddedEntry.getTarget().getSys().getId()).map(imageConverter);
+		return client.findImage(embeddedEntry.getTarget().getSys().getId()).map(richImageConverter);
 	}
 
 }
diff --git a/...vice/contentful/image/ImageConverter.java → ...ul/blogpost/converter/ImageConverter.java b/...vice/contentful/image/ImageConverter.java → ...ul/blogpost/converter/ImageConverter.java
@@ -1,23 +1,24 @@
-package com.gdevxy.blog.service.contentful.image;
+package com.gdevxy.blog.service.contentful.blogpost.converter;
+
+import java.util.function.Function;
 
-import com.gdevxy.blog.client.contentful.model.FeaturedImage;
-import com.gdevxy.blog.model.Image;
 import jakarta.enterprise.context.ApplicationScoped;
 
-import java.util.function.Function;
+import com.gdevxy.blog.client.contentful.model.FeaturedImage;
+import com.gdevxy.blog.model.Image;
 
 @ApplicationScoped
 public class ImageConverter implements Function<FeaturedImage, Image> {
 
 	@Override
-	public Image apply(FeaturedImage fi) {
+	public Image apply(FeaturedImage image) {
 
 		return Image.builder()
-				.url(fi.getUrl())
-				.width(fi.getWidth())
-				.height(fi.getHeight())
-				.contentType(fi.getContentType())
-				.build();
+			.url(image.getUrl())
+			.width(image.getWidth())
+			.height(image.getHeight())
+			.contentType(image.getContentType())
+			.build();
 	}
 
 }
diff --git a/...c/main/java/com/gdevxy/blog/service/contentful/blogpost/converter/RichImageConverter.java b/...c/main/java/com/gdevxy/blog/service/contentful/blogpost/converter/RichImageConverter.java
@@ -0,0 +1,25 @@
+package com.gdevxy.blog.service.contentful.blogpost.converter;
+
+import java.util.function.Function;
+
+import jakarta.enterprise.context.ApplicationScoped;
+
+import com.gdevxy.blog.client.contentful.model.ComponentRichImage;
+import com.gdevxy.blog.model.Image;
+import lombok.RequiredArgsConstructor;
+
+@ApplicationScoped
+@RequiredArgsConstructor
+public class RichImageConverter implements Function<ComponentRichImage, Image> {
+
+	private final ImageConverter imageConverter;
+
+	@Override
+	public Image apply(ComponentRichImage i) {
+
+		return imageConverter.apply(i.getImage()).toBuilder()
+			.fullWidth(i.getFullWidth())
+			.build();
+	}
+
+}
diff --git a/service/src/main/java/com/gdevxy/blog/service/contentful/image/ImageService.java b/service/src/main/java/com/gdevxy/blog/service/contentful/image/ImageService.java
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,5 +7,6 @@ query findImage($id: String!){ @@
                 height
                 url
             }
+            fullWidth
         }
     }