Skip to content

Commit

Permalink
fix: Save message after send (#19)
Browse files Browse the repository at this point in the history
Co-authored-by: Vitolo-Andrea <[email protected]>
Co-authored-by: DanieleRanaldo <[email protected]>
  • Loading branch information
3 people authored Jul 19, 2024
1 parent 8b6fe1c commit d20b5e7
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

import it.gov.pagopa.message.core.dto.MessageDTO;
import it.gov.pagopa.message.core.dto.TokenDTO;
import it.gov.pagopa.message.core.stub.model.MessageMapperDTOToObject;
import it.gov.pagopa.message.core.stub.repository.MessageRepository;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpEntity;
Expand All @@ -19,19 +21,25 @@ public class SendMessageServiceImpl implements SendMessageService {
private final RestTemplate restTemplate;
private final MessageErrorProducerService errorProducerService;

private final MessageRepository messageRepository;

private final MessageMapperDTOToObject mapperDTOToObject;

private final String client;
private final String clientId;
private final String grantType;

private final String tenantId;
public SendMessageServiceImpl(MessageErrorProducerService errorProducerService,
RestTemplate restTemplate,
@Value("${app.token.client}")String client,
MessageRepository messageRepository, MessageMapperDTOToObject mapperDTOToObject, @Value("${app.token.client}")String client,
@Value("${app.token.clientId}") String clientId,
@Value("${app.token.grantType}") String grantType,
@Value("${app.token.tenantId}") String tenantId) {
this.restTemplate = restTemplate;
this.errorProducerService = errorProducerService;
this.messageRepository = messageRepository;
this.mapperDTOToObject = mapperDTOToObject;
this.client = client;
this.clientId = clientId;
this.grantType = grantType;
Expand Down Expand Up @@ -99,7 +107,7 @@ private void toUrl(MessageDTO messageDTO, String messageUrl, TokenDTO token) thr
entity,
String.class).getBody();
log.info("[EMD][SEND-MESSAGE] Message sent correctly. Response: {}",response);

messageRepository.save(mapperDTOToObject.messageObjectMapper(messageDTO));
}


Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/static/asset-manifest.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"files": {
"main.css": "/static/css/main.7607bf2b.css",
"main.js": "/static/js/main.b1fd57ed.js",
"main.js": "/static/js/main.45090019.js",
"static/js/453.d070fbd4.chunk.js": "/static/js/453.d070fbd4.chunk.js",
"index.html": "/index.html",
"main.7607bf2b.css.map": "/static/css/main.7607bf2b.css.map",
"main.b1fd57ed.js.map": "/static/js/main.b1fd57ed.js.map",
"main.45090019.js.map": "/static/js/main.45090019.js.map",
"453.d070fbd4.chunk.js.map": "/static/js/453.d070fbd4.chunk.js.map"
},
"entrypoints": [
"static/css/main.7607bf2b.css",
"static/js/main.b1fd57ed.js"
"static/js/main.45090019.js"
]
}
2 changes: 1 addition & 1 deletion src/main/resources/static/index.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/emdmessagecore/manifest.json"/><title>TPP Platform</title><script defer="defer" src="/emdmessagecore/static/js/main.b1fd57ed.js"></script><link href="/emdmessagecore/static/css/main.7607bf2b.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/emdmessagecore/manifest.json"/><title>React App</title><script defer="defer" src="/emdmessagecore/static/js/main.45090019.js"></script><link href="/emdmessagecore/static/css/main.7607bf2b.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions src/main/resources/static/static/js/main.45090019.js.map

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion src/main/resources/static/static/js/main.b1fd57ed.js.map

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
import it.gov.pagopa.message.core.dto.TokenDTO;
import it.gov.pagopa.message.core.faker.MessageDTOFaker;
import it.gov.pagopa.message.core.faker.TokenDTOFaker;
import it.gov.pagopa.message.core.stub.model.MessageMapperDTOToObject;
import it.gov.pagopa.message.core.stub.repository.MessageRepository;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mockito;
Expand Down Expand Up @@ -34,6 +36,11 @@ class SendMesssageServiceTest {
@MockBean
MessageErrorProducerService errorProducerService;

@MockBean
MessageRepository messageRepository;
@MockBean
MessageMapperDTOToObject mapperDTOToObject;

@Autowired
SendMessageServiceImpl sendMessageService;

Expand Down

0 comments on commit d20b5e7

Please sign in to comment.