Skip to content
Snippets Groups Projects
Commit 17c730b2 authored by Martin Gargalovič's avatar Martin Gargalovič
Browse files

added validation to mail

parent e1b9d63f
No related branches found
No related tags found
1 merge request!12Mail module
Pipeline #
...@@ -22,6 +22,11 @@ ...@@ -22,6 +22,11 @@
<artifactId>spring-boot-starter</artifactId> <artifactId>spring-boot-starter</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId> <artifactId>spring-boot-starter-test</artifactId>
......
package org.fuseri.modulemail.service; package org.fuseri.modulemail.service;
import jakarta.validation.constraints.NotBlank;
public class EmailDto { public class EmailDto {
String sender; @NotBlank
String receiver; String receiver;
@NotBlank
String content; String content;
public EmailDto(String sender, String receiver, String content) { public EmailDto(String receiver, String content) {
this.sender = sender;
this.receiver = receiver; this.receiver = receiver;
this.content = content; this.content = content;
} }
@Override
public String toString() {
return "EmailDto{" +
"sender='" + sender + '\'' +
", receiver='" + receiver + '\'' +
", content='" + content + '\'' +
'}';
}
} }
package org.fuseri.modulemail.service; package org.fuseri.modulemail.service;
import jakarta.websocket.server.PathParam; import jakarta.validation.Valid;
import jakarta.validation.constraints.PositiveOrZero;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
...@@ -25,19 +25,17 @@ public class MailControler { ...@@ -25,19 +25,17 @@ public class MailControler {
@GetMapping("/{id}") @GetMapping("/{id}")
public ResponseEntity getEmail(@PathVariable("id") Long id) { public String getEmail(@PositiveOrZero @PathVariable("id") Long id) {
return ResponseEntity.ok(service.getMail(id).toString()); return "No mail with that id yet";
} }
@DeleteMapping("/delete/{id}") @DeleteMapping("/delete/{id}")
public ResponseEntity deleteMail(@PathVariable("id") Long id) { public String deleteMail(@PositiveOrZero @PathVariable("id") Long id) {
return ResponseEntity.ok(service.DeleteMail(id)); return "Nothing to delete Yet";
} }
@PostMapping() @PostMapping()
public ResponseEntity sendMail(@RequestBody EmailDto emailDto) { public String sendMail(@Valid @RequestBody EmailDto emailDto) {
return ResponseEntity.ok(service.send(emailDto)); return service.send(emailDto);
} }
} }
...@@ -12,7 +12,7 @@ public class MailService { ...@@ -12,7 +12,7 @@ public class MailService {
public String send(EmailDto dto) { public String send(EmailDto dto) {
var message = new SimpleMailMessage(); var message = new SimpleMailMessage();
message.setFrom(dto.sender); message.setFrom("sprachul@gmail.com");
message.setTo(dto.receiver); message.setTo(dto.receiver);
message.setSubject("Sprachschul"); message.setSubject("Sprachschul");
message.setText(dto.content); message.setText(dto.content);
...@@ -24,7 +24,7 @@ public class MailService { ...@@ -24,7 +24,7 @@ public class MailService {
} }
public EmailDto getMail(long id) { public EmailDto getMail(long id) {
return new EmailDto("","",""); // return from database once there is one return new EmailDto("empty","empty"); // return from database once there is one
} }
public String DeleteMail (long id) { public String DeleteMail (long id) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment