-
Notifications
You must be signed in to change notification settings - Fork 354
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: Unable to save outbound sms during async operation [DHIS2-18586] (…
- Loading branch information
Showing
7 changed files
with
132 additions
and
35 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
114 changes: 114 additions & 0 deletions
114
dhis-2/dhis-test-integration/src/test/java/org/hisp/dhis/message/SmsMessageSenderTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,114 @@ | ||
| /* | ||
| * Copyright (c) 2004-2024, University of Oslo | ||
| * All rights reserved. | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions are met: | ||
| * Redistributions of source code must retain the above copyright notice, this | ||
| * list of conditions and the following disclaimer. | ||
| * | ||
| * Redistributions in binary form must reproduce the above copyright notice, | ||
| * this list of conditions and the following disclaimer in the documentation | ||
| * and/or other materials provided with the distribution. | ||
| * Neither the name of the HISP project nor the names of its contributors may | ||
| * be used to endorse or promote products derived from this software without | ||
| * specific prior written permission. | ||
| * | ||
| * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND | ||
| * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
| * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
| * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR | ||
| * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
| * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
| * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON | ||
| * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
| * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| */ | ||
| package org.hisp.dhis.message; | ||
|
|
||
| import static org.junit.jupiter.api.Assertions.assertAll; | ||
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||
| import static org.junit.jupiter.api.Assertions.assertFalse; | ||
|
|
||
| import java.util.List; | ||
| import java.util.Set; | ||
| import java.util.concurrent.TimeUnit; | ||
| import org.awaitility.Awaitility; | ||
| import org.hisp.dhis.feedback.BadRequestException; | ||
| import org.hisp.dhis.feedback.ConflictException; | ||
| import org.hisp.dhis.feedback.ForbiddenException; | ||
| import org.hisp.dhis.sms.config.BulkSmsGatewayConfig; | ||
| import org.hisp.dhis.sms.config.GatewayAdministrationService; | ||
| import org.hisp.dhis.sms.config.SmsGatewayConfig; | ||
| import org.hisp.dhis.sms.outbound.OutboundSms; | ||
| import org.hisp.dhis.sms.outbound.OutboundSmsService; | ||
| import org.hisp.dhis.test.integration.PostgresIntegrationTestBase; | ||
| import org.hisp.dhis.user.User; | ||
| import org.junit.jupiter.api.BeforeAll; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.junit.jupiter.api.TestInstance; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
| import org.springframework.beans.factory.annotation.Qualifier; | ||
|
|
||
| /** | ||
| * @author Zubair Asghar | ||
| */ | ||
| @TestInstance(TestInstance.Lifecycle.PER_CLASS) | ||
| class SmsMessageSenderTest extends PostgresIntegrationTestBase { | ||
|
|
||
| @Autowired | ||
| @Qualifier("smsMessageSender") | ||
| private MessageSender smsMessageSender; | ||
|
|
||
| @Autowired private OutboundSmsService outboundSmsService; | ||
|
|
||
| @Autowired private GatewayAdministrationService gatewayAdministrationService; | ||
|
|
||
| private User sender; | ||
| private User userA; | ||
| private User userB; | ||
| private Set<User> users; | ||
|
|
||
| @BeforeAll | ||
| void setUp() throws ForbiddenException, ConflictException, BadRequestException { | ||
| sender = makeUser("S"); | ||
| userA = makeUser("A"); | ||
| userA.setPhoneNumber("40342434"); | ||
| userB = makeUser("B"); | ||
|
|
||
| userService.addUser(sender); | ||
| userService.addUser(userA); | ||
| userService.addUser(userB); | ||
|
|
||
| users = Set.of(userA, userB); | ||
|
|
||
| SmsGatewayConfig smsGatewayConfig = new BulkSmsGatewayConfig(); | ||
| smsGatewayConfig.setDefault(true); | ||
| smsGatewayConfig.setUsername("user_uio"); | ||
| smsGatewayConfig.setPassword("RefLt4N5<1"); | ||
|
|
||
| gatewayAdministrationService.addGateway(smsGatewayConfig); | ||
| } | ||
|
|
||
| @Test | ||
| void shouldSendMessageAsyncAndSaveOutboundSms() { | ||
| smsMessageSender.sendMessageAsync("subject", "text_message", "footer", sender, users, true); | ||
|
|
||
| // Wait until the outbound SMS is persisted | ||
| Awaitility.await() | ||
| .atMost(10, TimeUnit.SECONDS) | ||
| .until(() -> !outboundSmsService.getAll().isEmpty()); | ||
|
|
||
| List<OutboundSms> outboundSms = outboundSmsService.getAll(); | ||
|
|
||
| assertAll( | ||
| "Verify outbound SMS creation", | ||
| () -> assertFalse(outboundSms.isEmpty(), "Outbound SMS list should not be empty"), | ||
| () -> | ||
| assertEquals( | ||
| "text_message", | ||
| outboundSms.get(0).getMessage(), | ||
| "Message text should match the sent message")); | ||
| } | ||
| } |