Remove old email service (spark post email via SMTP server on GCP not…

… supported anymore) (#51)
conorheffron · Jul 22, 2024 · 7a8ca62 · 7a8ca62
1 parent 5278719
commit 7a8ca62
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 68 deletions.
diff --git a/README.md b/README.md
@@ -29,21 +29,21 @@ docker compose up -d
 http://localhost:8080/
 ```
 
-![SPA-home](./spa-home.png)
+![SPA-home](images/spa-home.png)
 
 
 ## View contact requests in embedded DB
 ```
 http://localhost:8080/contact
 ```
-![contact-form](./contact-form.png)
+![contact-form](images/contact-form.png)
 
 ```
 http://localhost:8080/h2-console
 ```
 
-![h2-console](./h2-console.png)
+![h2-console](images/h2-console.png)
 
-![db-query-contacts](db-query-contacts.png)
+![db-query-contacts](images/db-query-contacts.png)
 
 
diff --git a/contact-form.png → images/contact-form.png b/contact-form.png → images/contact-form.png
diff --git a/db-query-contacts.png → images/db-query-contacts.png b/db-query-contacts.png → images/db-query-contacts.png
diff --git a/h2-console.png → images/h2-console.png b/h2-console.png → images/h2-console.png
diff --git a/spa-home.png → images/spa-home.png b/spa-home.png → images/spa-home.png
diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
 
 	<groupId>com.marjade.roniet</groupId>
 	<artifactId>marjaderoniet</artifactId>
-	<version>4.1.0</version>
+	<version>4.1.1</version>
 	<name>FashionApp</name>
 	<description>Fashion portfolio</description>
 

diff --git a/src/main/java/com/marjade/roniet/controller/ContactController.java b/src/main/java/com/marjade/roniet/controller/ContactController.java
@@ -5,7 +5,6 @@
 import com.marjade.roniet.domain.ContactResponse;
 import com.marjade.roniet.domain.RequestStatus;
 import com.marjade.roniet.model.Contact;
-import com.marjade.roniet.service.EmailService;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -25,9 +24,6 @@ public class ContactController {
 	@Autowired
 	private ContactDao contactDao;
 
-	@Autowired
-	private EmailService emailService;
-
 	@Autowired
 	private Environment environment;
 
@@ -52,7 +48,7 @@ public class ContactController {
 
 		String recipient = environment.getProperty("com.marjade.roniet.email.recipient");
 		Contact contact = new Contact(email, firstName, lastName, message, recipient);
-		
+
 		// send to message queue
 		contactRequest.setRecipient(recipient);
 
@@ -69,15 +65,8 @@ public class ContactController {
 			return new ContactResponse(false, RequestStatus.SAVE_FAIL);
 		}
 
-		// send email
-		boolean response = emailService.sendEmail(savedContact);
-		if (response) {
-			// success
-			return new ContactResponse(true, RequestStatus.OK);
-		}
-
-		// else fail
-		return new ContactResponse(false, RequestStatus.EMAIL_FAILED);
+		// success
+		return new ContactResponse(true, RequestStatus.OK);
 	}
 
 }
diff --git a/src/main/java/com/marjade/roniet/service/EmailService.java b/src/main/java/com/marjade/roniet/service/EmailService.java
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -6,6 +6,8 @@ spring.cloud.gcp.sql.database-name=marjaderoniet-db
 
 # Data Source
 spring.h2.console.enabled=true
+spring.h2.console.path=/h2-console
+spring.h2.console.settings.web-allow-others=true
 spring.datasource.url=jdbc:h2:mem:marjaderoniet;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE;AUTO_RECONNECT=TRUE;
 spring.datasource.username=sa
 spring.datasource.password=password