Skip to content

v3.2.0 with dependecies upgrade and migrate SMS Service to AWS SDK SN… #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marioserrano09 merged 1 commit into from
Jan 17, 2025
Merged

v3.2.0 with dependecies upgrade and migrate SMS Service to AWS SDK SN… #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions sources/core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
<parent>
<artifactId>tools.dynamia.modules.email.parent</artifactId>
<groupId>tools.dynamia.modules</groupId>
<version>3.1.2</version>
<version>3.2.0</version>
</parent>

<artifactId>tools.dynamia.modules.email</artifactId>
<name>DynamiaModules - Email</name>
<version>3.1.2</version>
<version>3.2.0</version>
<url>https://www.dynamiasoluciones.com</url>


Expand Down Expand Up @@ -77,9 +77,10 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-sns</artifactId>
<groupId>software.amazon.awssdk</groupId>
<artifactId>sns</artifactId>
<version>${aws.version}</version>
</dependency>

</dependencies>
</project>
116 changes: 58 additions & 58 deletions sources/core/src/main/java/tools/dynamia/modules/email/services/impl/SMSServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,13 @@

package tools.dynamia.modules.email.services.impl;

import com.amazonaws.auth.AWSCredentialsProvider;
import com.amazonaws.auth.AWSStaticCredentialsProvider;
import com.amazonaws.auth.BasicAWSCredentials;
import com.amazonaws.services.sns.AmazonSNSAsync;
import com.amazonaws.services.sns.AmazonSNSAsyncClientBuilder;
import com.amazonaws.services.sns.model.AmazonSNSException;
import com.amazonaws.services.sns.model.MessageAttributeValue;
import com.amazonaws.services.sns.model.PublishRequest;
import com.amazonaws.services.sns.model.PublishResult;

import org.springframework.stereotype.Service;
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
import software.amazon.awssdk.regions.Region;
import software.amazon.awssdk.services.sns.SnsClient;
import software.amazon.awssdk.services.sns.model.MessageAttributeValue;
import software.amazon.awssdk.services.sns.model.PublishRequest;
import tools.dynamia.domain.services.AbstractService;
import tools.dynamia.integration.Containers;
import tools.dynamia.modules.email.SMSMessage;
Expand All @@ -44,58 +41,61 @@ public class SMSServiceImpl extends AbstractService implements SMSService {
public String send(SMSMessage message) {
validate(message);

AmazonSNSAsync snsClient = buildSNSClient(message);


Map<String, MessageAttributeValue> smsAttributes = new HashMap<>();
if (message.isTransactional()) {
smsAttributes.put("AWS.SNS.SMS.SMSType", new MessageAttributeValue()
.withStringValue("Transactional")
.withDataType("String"));
}

if (message.getSenderID() != null && !message.getSenderID().isEmpty()) {
smsAttributes.put("AWS.SNS.SMS.SenderID", new MessageAttributeValue()
.withStringValue(message.getSenderID()) //The sender ID shown on the device.
.withDataType("String"));
}


log("Sending SMS to " + message.getPhoneNumber());
fireSendingListener(message);
try {
PublishResult result = snsClient.publish(new PublishRequest()
.withMessage(message.getText())
.withPhoneNumber(message.getPhoneNumber())
.withMessageAttributes(smsAttributes));

log("SMS Result: " + result);
log("Creating log for sms message " + message.getPhoneNumber());
new SMSMessageLog(message.getPhoneNumber(),
message.getText(), result.getMessageId(),
message.getAccountId())
.save();


message.setResult(result.getMessageId());
message.setMessageId(result.getMessageId());
message.setSended(true);
log("SMS Sended - " + message.getPhoneNumber() + " message id: " + message.getResult());
fireSendedListener(message);
return message.getResult();
} catch (AmazonSNSException ex) {
message.setResult(ex.getMessage());
log("Error sending sms to " + message.getPhoneNumber() + ": " + ex.getMessage(), ex);
return null;
try (var snsClient = buildSNSClient(message)) {


Map<String, MessageAttributeValue> smsAttributes = new HashMap<>();
if (message.isTransactional()) {
smsAttributes.put("AWS.SNS.SMS.SMSType", MessageAttributeValue.builder()
.stringValue("Transactional")
.dataType("String").build());
}

if (message.getSenderID() != null && !message.getSenderID().isEmpty()) {
smsAttributes.put("AWS.SNS.SMS.SenderID", MessageAttributeValue.builder()
.stringValue(message.getSenderID())
.dataType("String").build());
}


log("Sending SMS to " + message.getPhoneNumber());
fireSendingListener(message);
try {
var request = PublishRequest.builder()
.message(message.getText())
.phoneNumber(message.getPhoneNumber())
.messageAttributes(smsAttributes)
.build();

var result = snsClient.publish(request);

log("SMS Result: " + result);
log("Creating log for sms message " + message.getPhoneNumber());
new SMSMessageLog(message.getPhoneNumber(),
message.getText(), result.messageId(),
message.getAccountId())
.save();


message.setResult(result.messageId());
message.setMessageId(result.messageId());
message.setSended(true);
log("SMS Sended - " + message.getPhoneNumber() + " message id: " + message.getResult());
fireSendedListener(message);
return message.getResult();
} catch (Exception ex) {
message.setResult(ex.getMessage());
log("Error sending sms to " + message.getPhoneNumber() + ": " + ex.getMessage(), ex);
return null;
}
}
}

private AmazonSNSAsync buildSNSClient(SMSMessage message) {
AWSCredentialsProvider credentials = new AWSStaticCredentialsProvider(new BasicAWSCredentials(message.getUsername(), message.getPassword()));

return AmazonSNSAsyncClientBuilder.standard()
.withCredentials(credentials)
.withRegion(message.getRegion())
private SnsClient buildSNSClient(SMSMessage message) {
var credentials = AwsBasicCredentials.create(message.getUsername(), message.getPassword());
return SnsClient.builder()
.credentialsProvider(() -> credentials)
.region(Region.of(message.getRegion()))
.build();
}

Expand Down
10 changes: 5 additions & 5 deletions sources/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<artifactId>tools.dynamia.modules.email.parent</artifactId>
<name>DynamiaModules - Email Parent</name>
<packaging>pom</packaging>
<version>3.1.2</version>
<version>3.2.0</version>
<description>DynamiaTools extension for sending async emails (SMTP) and sms messages (AWS SNS)</description>
<inceptionYear>2018</inceptionYear>
<url>https://www.dynamia.tools/modules/email</url>
Expand Down Expand Up @@ -56,12 +56,12 @@

<properties>
<java.version>17</java.version>
<dynamiatools.version>5.2.0</dynamiatools.version>
<saas.version>3.1.4</saas.version>
<dynamiatools.version>5.3.1</dynamiatools.version>
<saas.version>3.2.0</saas.version>
<maven.compiler>3.13.0</maven.compiler>
<source.encoding>UTF-8</source.encoding>
<springboot.version>3.3.3</springboot.version>
<aws.version>1.12.771</aws.version>
<springboot.version>3.4.1</springboot.version>
<aws.version>2.29.47</aws.version>
</properties>

<modules>
Expand Down
6 changes: 3 additions & 3 deletions sources/ui/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
<parent>
<artifactId>tools.dynamia.modules.email.parent</artifactId>
<groupId>tools.dynamia.modules</groupId>
<version>3.1.2</version>
<version>3.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<name>DynamiaModules - Email UI</name>
<artifactId>tools.dynamia.modules.email.ui</artifactId>
<version>3.1.2</version>
<version>3.2.0</version>
<url>https://www.dynamiasoluciones.com</url>

<dependencies>
Expand All @@ -38,7 +38,7 @@
<dependency>
<groupId>tools.dynamia.modules</groupId>
<artifactId>tools.dynamia.modules.email</artifactId>
<version>3.1.2</version>
<version>3.2.0</version>
</dependency>
<dependency>
<groupId>tools.dynamia.zk.addons</groupId>
Expand Down
Loading