Fix #5, #16; User email wont assign until server confirms

Prior to this commit the email id was even assigned
to the user in case the server was throwing error.
This was a bug and is now fixed.

Author: rosehgal

.gitignore

@@ -9,6 +9,7 @@ mvnw.cmd
 **/application-dev.yml
 **/application-prod.yml
 **/application-qa.yml
+src/main/resources/application.yml
 *.db
 lib/
 bin/

src/main/java/io/github/trashemail/EmailInteraction/EmailServerInteraction.java

@@ -1,5 +1,9 @@
 package io.github.trashemail.EmailInteraction;
 
+import io.github.trashemail.Telegram.TelegramRequestHandler;
+import io.github.trashemail.utils.exceptions.EmailAliasNotCreatedExecption;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.*;
 import org.springframework.stereotype.Component;
@@ -21,8 +25,9 @@ public class EmailServerInteraction {
 	@Autowired
 	RestTemplate restTemplate;
 
-	
-	public String createEmailId(User user) throws HttpClientErrorException {
+	private static final Logger log = LoggerFactory.getLogger(EmailServerInteraction.class);
+
+	public String createEmailId(User user) throws HttpClientErrorException, EmailAliasNotCreatedExecption {
 
 		HttpHeaders headers = new HttpHeaders();
 		headers.setBasicAuth(
@@ -48,13 +53,8 @@ public String createEmailId(User user) throws HttpClientErrorException {
 					"successfully Created :)";
 		}
 
-		if(response.getStatusCode() == HttpStatus.BAD_REQUEST &&
-				((String)response.getBody()).contains("Alias already exists")){
-			return "Email ID : *"+user.getEmailId()+"* "+
-					"already taken :)";
-		}
-
-		return response.getBody().toString();
+		log.error(response.getStatusCode().toString() + response.getBody());
+		throw new EmailAliasNotCreatedExecption(response.getBody().toString());
 	}
 
 	public boolean deleteEmailId(User user) {

src/main/java/io/github/trashemail/Telegram/TelegramRequestHandler.java

@@ -5,6 +5,7 @@
 import java.util.regex.Pattern;
 
 import io.github.trashemail.Configurations.EmailServerConfiguration;
+import io.github.trashemail.utils.exceptions.EmailAliasNotCreatedExecption;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,7 +27,7 @@ public class TelegramRequestHandler {
 
 	private static final Logger log = LoggerFactory.getLogger(TelegramRequestHandler.class);
 
-	public String createEmail(User user) throws HttpClientErrorException {
+	public String createEmail(User user) throws HttpClientErrorException, EmailAliasNotCreatedExecption {
 		return emailServerInteraction.createEmailId(user); 
 	}
 	public String deleteEmail(User user) throws HttpClientErrorException{
@@ -96,8 +97,29 @@ public String handleRequest(long chatId, String text) {
 						User user = new User(chatId,
 								   			 emailId,
 											 emailServerConfiguration.getEmailServerImapTaregtUsername());
-						userRepository.save(user);
-						return this.createEmail(user);
+
+						String response = null;
+						try {
+
+							response = this.createEmail(user);
+
+						}catch (EmailAliasNotCreatedExecption emailAliasNotCreatedExecption){
+
+							log.error("Exception " + emailAliasNotCreatedExecption.getMessage());
+							return "Email address is already taken.\nPlease try something else.";
+
+						}catch (HttpClientErrorException httpClientErrorException){
+
+							log.error("Exception " + httpClientErrorException.getMessage());
+							return "Email address is already taken.\nPlease try something else.";
+						}
+
+						if(response!=null) {
+							userRepository.save(user);
+							return "Something bad just happened with me. Stay back till I get fixed.";
+						}
+
+						return response;
 					}
 					else{
 						if(argument.isEmpty())

src/main/java/io/github/trashemail/utils/exceptions/EmailAliasNotCreatedExecption.java

@@ -0,0 +1,7 @@
+package io.github.trashemail.utils.exceptions;
+
+public class EmailAliasNotCreatedExecption extends Exception {
+    public EmailAliasNotCreatedExecption(String exceptionMessage){
+        super(exceptionMessage);
+    }
+}