chore: update

.prettierrc

@@ -5,5 +5,7 @@
 	"tabWidth": 2,
 	"trailingComma": "all",
 	"useTabs": true,
+	"xmlSortAttributesByKey": true,
+	"xmlQuoteAttributes": "double",
 	"plugins": ["prettier-plugin-java", "@prettier/plugin-xml"]
 }

account-service/pom.xml

@@ -49,6 +49,11 @@
             <artifactId>lib</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-mockito</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-jdbc-h2</artifactId>

account-service/src/main/java/com/drinkool/services/AccountService.java

@@ -22,10 +22,7 @@ public class AccountService {
 			.entity("InvalidPhoneNumber")
 			.build();
 
-		String otp = otpService.generateAndSaveOtp(input.phone);
+		otpService.generateAndSaveOtp(input.phone);
-
-		// Ở đây bạn sẽ gọi Kafka để gửi SMS thực tế
-		System.out.println("OTP cho " + input.phone + " là: " + otp);
 
 		return Response.accepted().build();
 	}

account-service/src/main/java/com/drinkool/services/OtpService.java

@@ -1,9 +1,11 @@
 package com.drinkool.services;
 
+import com.drinkool.utils.SmsApi;
 import io.quarkus.redis.datasource.RedisDataSource;
 import io.quarkus.redis.datasource.value.ValueCommands;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
+import java.io.IOException;
 import java.util.Random;
 
 @ApplicationScoped
@@ -11,18 +13,29 @@ public class OtpService {
 
 	private final ValueCommands<String, String> countCommands;
 
+	@Inject
+	SmsApi smsApi;
+
 	@Inject
 	public OtpService(RedisDataSource ds) {
 		this.countCommands = ds.value(String.class);
 	}
 
-	public String generateAndSaveOtp(String phone) {
+	public void generateAndSaveOtp(String phone) {
 		String otp = String.format("%06d", new Random().nextInt(1000000));
 		String key = "otp:" + phone;
 
 		countCommands.setex(key, 300, otp);
 
-		return otp;
+		String smsStatus = null;
+
+		try {
+			smsStatus = smsApi.sendSMS(phone, "Mã OTP drinkool của bạn là " + otp);
+		} catch (IOException e) {
+			e.printStackTrace();
+		} finally {
+			System.out.println("SMS API response: " + smsStatus);
+		}
 	}
 
 	public boolean verifyOtp(String phone, String inputOtp) {

account-service/src/main/java/com/drinkool/utils/SmsApi.java

@@ -0,0 +1,113 @@
+package com.drinkool.utils;
+
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.xml.bind.DatatypeConverter;
+import java.io.*;
+import java.net.*;
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+
+@ApplicationScoped
+public class SmsApi {
+
+	public static final String API_URL = "https://api.speedsms.vn/index.php";
+	protected String mAccessToken;
+	protected String mBrandName;
+
+	public SmsApi(
+		@ConfigProperty(name = "sms.api.token") String accessToken
+		// @ConfigProperty(name = "sms.api.brand") String brandName
+	) {
+		this.mAccessToken = accessToken;
+		this.mBrandName = "";
+	}
+
+	/**
+	 * Get user information
+	 * @param: none
+	 * @return: json string
+	 * */
+	public String getUserInfo() throws IOException {
+		URI uri = URI.create(API_URL + "/user/info");
+		HttpURLConnection conn = (HttpURLConnection) uri.toURL().openConnection();
+		conn.setRequestMethod("GET");
+		String userCredentials = mAccessToken + ":x";
+		String basicAuth =
+			"Basic " +
+			DatatypeConverter.printBase64Binary(userCredentials.getBytes());
+		conn.setRequestProperty("Authorization", basicAuth);
+
+		BufferedReader in = new BufferedReader(
+			new InputStreamReader(conn.getInputStream())
+		);
+		String inputLine = "";
+		StringBuffer buffer = new StringBuffer();
+
+		while ((inputLine = in.readLine()) != null) {
+			buffer.append(inputLine);
+		}
+		in.close();
+		return buffer.toString();
+	}
+
+	/**
+	 * Send SMS
+	 * @param
+	 * @return: json string
+	 * */
+	public String sendSMS(String to, String content)
+		throws IOException {
+		String json =
+			"{\"to\": [\"" +
+			to +
+			"\"], \"content\": \"" +
+			EncodeNonAsciiCharacters(content) +
+			"\", \"type\":" +
+			4 +
+			", \"brandname\":\"" +
+			this.mBrandName +
+			"\"}";
+		URI uri = URI.create(API_URL + "/sms/send");
+		HttpURLConnection conn = (HttpURLConnection) uri.toURL().openConnection();
+		conn.setRequestMethod("POST");
+		String userCredentials = mAccessToken + ":x";
+		String basicAuth =
+			"Basic " +
+			DatatypeConverter.printBase64Binary(userCredentials.getBytes());
+		conn.setRequestProperty("Authorization", basicAuth);
+		conn.setRequestProperty("Content-Type", "application/json");
+
+		conn.setDoOutput(true);
+		DataOutputStream wr = new DataOutputStream(conn.getOutputStream());
+		wr.writeBytes(json);
+		wr.flush();
+		wr.close();
+
+		BufferedReader in = new BufferedReader(
+			new InputStreamReader(conn.getInputStream())
+		);
+		String inputLine = "";
+		StringBuffer buffer = new StringBuffer();
+
+		while ((inputLine = in.readLine()) != null) {
+			buffer.append(inputLine);
+		}
+		in.close();
+		return buffer.toString();
+	}
+
+	private String EncodeNonAsciiCharacters(String value) {
+		StringBuffer sb = new StringBuffer();
+		for (int i = 0; i < value.length(); i++) {
+			char c = value.charAt(i);
+			int unit = (int) c;
+			if (unit > 127) {
+				String hex = String.format("%04x", (int) unit);
+				String encodedValue = "\\u" + hex;
+				sb.append(encodedValue);
+			} else {
+				sb.append(c);
+			}
+		}
+		return sb.toString();
+	}
+}

account-service/src/main/resources/application.properties

@@ -2,7 +2,7 @@
 quarkus.datasource.db-kind=postgresql
 quarkus.datasource.username=postgres
 quarkus.datasource.password=password
-quarkus.datasource.jdbc.url=jdbc:postgresql://localhost:5432/postgres
+quarkus.datasource.jdbc.url=jdbc:postgresql://host.docker.internal:5432/postgres
 
 quarkus.hibernate-orm.database.generation=update
 
@@ -16,7 +16,7 @@ quarkus.container-image.builder=docker
 quarkus.container-image.additional-tags=latest
 
 # Redis
-quarkus.redis.hosts=redis://localhost:6379
+quarkus.redis.hosts=redis://${REDIS_SERVICE_SERVICE_HOST:localhost}:${REDIS_SERVICE_SERVICE_PORT:6379}
 
 
 # Dependency
@@ -27,4 +27,7 @@ quarkus.index-dependency.lib.artifact-id=lib
 quarkus.native.container-build=true
 quarkus.native.remote-container-build=true
 quarkus.native.additional-build-args=--initialize-at-run-time=com.password4j.AlgorithmFinder,--future-defaults=all
-quarkus.native.resources.includes=com/google/i18n/phonenumbers/data/**/*
+quarkus.native.resources.includes=com/google/i18n/phonenumbers/data/**/*
+
+# Sms API
+sms.api.token=vc6kYQey8nFG7uRe7U4eYB3Iwq2JAiQa

account-service/src/test/java/com/drinkool/services/CustomerServiceTest.java

@@ -1,16 +1,19 @@
 package com.drinkool.services;
 
 import static io.restassured.RestAssured.*;
-import static org.hamcrest.CoreMatchers.*;
 import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.*;
 
 import com.drinkool.*;
 import com.drinkool.dtos.*;
 import com.drinkool.entities.CustomerEntity;
-import io.quarkus.test.junit.QuarkusTest;
+import com.drinkool.utils.SmsApi;
+import io.quarkus.test.junit.*;
 import io.restassured.http.ContentType;
 import jakarta.inject.Inject;
-import org.junit.jupiter.api.Test;
+import java.io.IOException;
+import org.junit.jupiter.api.*;
+import org.mockito.ArgumentCaptor;
 
 @QuarkusTest
 public class CustomerServiceTest {
@@ -18,6 +21,15 @@ public class CustomerServiceTest {
 	@Inject
 	OtpService otpService;
 
+	SmsApi smsApiMock;
+
+	@BeforeEach
+	public void setup() {
+		SmsApi mock = mock(SmsApi.class);
+		QuarkusMock.installMockForType(mock, SmsApi.class);
+		this.smsApiMock = mock;
+	}
+
 	@Test
 	void testSignup() {
 		String phone = Utils.generateRandomPhone();
@@ -114,7 +126,7 @@ public class CustomerServiceTest {
 	}
 
 	@Test
-	public void testQuickLogin_Success() {
+	public void testQuickLogin_Success() throws IOException {
 		String phone = Utils.generateRandomPhone();
 
 		QuickSignup input = new QuickSignup();
@@ -129,7 +141,18 @@ public class CustomerServiceTest {
 
 		QuickLogin payload = new QuickLogin();
 		payload.phone = phone;
-		payload.otp = otpService.generateAndSaveOtp(phone);
+		otpService.generateAndSaveOtp(phone);
+
+		ArgumentCaptor<String> contentCaptor = ArgumentCaptor.forClass(
+			String.class
+		);
+
+		verify(smsApiMock).sendSMS(eq(phone), contentCaptor.capture());
+
+		// 4. Trích xuất mã OTP từ nội dung tin nhắn đã bắt được
+		// Giả sử tin nhắn có định dạng: "... là 123456"
+		String sentMessage = contentCaptor.getValue();
+		payload.otp = sentMessage.substring(sentMessage.length() - 6);
 
 		given()
 			.contentType(ContentType.JSON)

account-service/src/test/java/com/drinkool/services/OtpServiceTest.java

@@ -1,11 +1,17 @@
 package com.drinkool.services;
 
 import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.*;
 
-import io.quarkus.test.junit.QuarkusTest;
+import com.drinkool.utils.SmsApi;
+import io.quarkus.redis.datasource.RedisDataSource;
+import io.quarkus.test.junit.*;
 import jakarta.inject.Inject;
+import java.io.IOException;
 import java.util.Random;
-import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.*;
+import org.mockito.ArgumentCaptor;
 
 @QuarkusTest
 public class OtpServiceTest {
@@ -13,24 +19,53 @@ public class OtpServiceTest {
 	@Inject
 	OtpService otpService;
 
+	@Inject
+	RedisDataSource redisDataSource;
+
+	SmsApi smsApiMock;
+
+	@BeforeEach
+	public void setup() {
+		SmsApi mock = mock(SmsApi.class);
+		QuarkusMock.installMockForType(mock, SmsApi.class);
+		this.smsApiMock = mock;
+	}
+
 	// 1. Test case: Tạo và lưu OTP thành công
 	@Test
 	public void testGenerateAndSaveOtp() {
 		String phone =
 			"+8477" + String.format("%07d", new Random().nextInt(10000000));
-		String otp = otpService.generateAndSaveOtp(phone);
+		String redisKey = "otp:" + phone;
 
-		assertNotNull(otp, "OTP sinh ra không được null");
+		otpService.generateAndSaveOtp(phone);
-		assertEquals(6, otp.length(), "OTP phải có độ dài đúng 6 ký tự");
+
-		assertTrue(otp.matches("\\d{6}"), "OTP chỉ được chứa các chữ số");
+		String otpFromRedis = redisDataSource.value(String.class).get(redisKey);
+
+		assertNotNull(otpFromRedis, "Mã OTP phải tồn tại trong Redis");
+		assertEquals(6, otpFromRedis.length(), "Mã OTP phải có 6 chữ số");
+
+		long ttl = redisDataSource.key().ttl(redisKey);
+		assertTrue(ttl > 0 && ttl <= 300, "TTL của OTP phải hợp lệ");
 	}
 
 	// 2. Test case: Xác thực OTP thành công
 	@Test
-	public void testVerifyOtpSuccess() {
+	public void testVerifyOtpSuccess() throws IOException {
 		String phone =
 			"+8477" + String.format("%07d", new Random().nextInt(10000000));
-		String generatedOtp = otpService.generateAndSaveOtp(phone);
+		otpService.generateAndSaveOtp(phone);
+
+		ArgumentCaptor<String> contentCaptor = ArgumentCaptor.forClass(
+			String.class
+		);
+
+		verify(smsApiMock).sendSMS(eq(phone), contentCaptor.capture());
+
+		// 4. Trích xuất mã OTP từ nội dung tin nhắn đã bắt được
+		// Giả sử tin nhắn có định dạng: "... là 123456"
+		String sentMessage = contentCaptor.getValue();
+		String generatedOtp = sentMessage.substring(sentMessage.length() - 6);
 
 		// Xác thực với OTP vừa tạo ra
 		boolean verifyResult = otpService.verifyOtp(phone, generatedOtp);
@@ -68,10 +103,21 @@ public class OtpServiceTest {
 
 	// 5. Test case: Đảm bảo OTP chỉ được sử dụng 1 lần (đã bị xóa sau khi verify thành công bằng lệnh getdel)
 	@Test
-	public void testVerifyOtpConsumedAfterSuccess() {
+	public void testVerifyOtpConsumedAfterSuccess() throws IOException {
 		String phone =
 			"+8477" + String.format("%07d", new Random().nextInt(10000000));
-		String generatedOtp = otpService.generateAndSaveOtp(phone);
+		otpService.generateAndSaveOtp(phone);
+
+		ArgumentCaptor<String> contentCaptor = ArgumentCaptor.forClass(
+			String.class
+		);
+
+		verify(smsApiMock).sendSMS(eq(phone), contentCaptor.capture());
+
+		// 4. Trích xuất mã OTP từ nội dung tin nhắn đã bắt được
+		// Giả sử tin nhắn có định dạng: "... là 123456"
+		String sentMessage = contentCaptor.getValue();
+		String generatedOtp = sentMessage.substring(sentMessage.length() - 6);
 
 		// Lần 1: Xác thực thành công
 		assertTrue(otpService.verifyOtp(phone, generatedOtp));

account-service/src/test/resources/application.properties

@@ -8,3 +8,6 @@ quarkus.http.host=0.0.0.0
 
 ## Orm
 %test.quarkus.hibernate-orm.database.generation=drop-and-create
+
+# Sms API
+sms.api.token=your_sms_api_token_here

gateway-service/src/main/java/com/drinkool/controller/IndexController.java

@@ -0,0 +1,25 @@
+package com.drinkool.controller;
+
+import com.drinkool.Url;
+import com.drinkool.dtos.SmsOtp;
+import com.drinkool.services.BaseService;
+import io.smallrye.mutiny.Uni;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.core.Response;
+import org.eclipse.microprofile.rest.client.inject.RestClient;
+
+@Path("/api")
+public class IndexController {
+
+	@Inject
+	@RestClient
+	BaseService baseService;
+
+	@POST
+	@Path(Url.SmsOtp)
+	public Uni<Response> smsOtp(SmsOtp input) {
+		return baseService.smsOtp(input);
+	}
+}

gateway-service/src/main/java/com/drinkool/services/BaseService.java

@@ -0,0 +1,17 @@
+package com.drinkool.services;
+
+import com.drinkool.Url;
+import com.drinkool.dtos.SmsOtp;
+import io.smallrye.mutiny.Uni;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.core.Response;
+import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
+
+@RegisterRestClient(configKey = "account")
+@Path("")
+public interface BaseService {
+	@POST
+	@Path(Url.SmsOtp)
+	Uni<Response> smsOtp(SmsOtp input);
+}

k8s.yaml

@@ -20,7 +20,7 @@ spec:
           ports:
             - containerPort: 8080
           env:
-            - name: QUARKUS_REDIS_HOST
+            - name: REDIS_SERVICE
               value: "redis-service"
             - name: QUARKUS_DATASOURCE_PASSWORD
               valueFrom:
@@ -37,6 +37,11 @@ spec:
                 secretKeyRef:
                   name: postgres-credentials
                   key: url
+            - name: SMS_API_TOKEN
+              valueFrom:
+                secretKeyRef:
+                  name: sms-api-token
+                  key: value
           resources:
             requests:
               memory: "32Mi"