merge

Back-end/src/main/java/Controller/ContactsFilter/ContactsSearchingCustomizedCriteria.java

@@ -13,14 +13,14 @@ public ContactsSearchingCustomizedCriteria(String target){
 
     @Override
     public ArrayList<ContactI> meetCriteria(ArrayList<ContactI> contacts) {
-        ArrayList<ContactI> filteredContacts = new ArrayList<ContactI>();
+        ArrayList<ContactI> filteredContacts = new ArrayList<>();
+
         for(ContactI contact:contacts){
             if((contact.getUsername().toLowerCase()).concat(contact.getEmailAddresses().toString().toLowerCase()
                     ).contains(this.target.toLowerCase())){
                 filteredContacts.add(contact);
             }
         }
-
         return filteredContacts;
     }
 }

Back-end/src/main/java/Controller/Profile/Elements/Email/Attachment.java

@@ -16,7 +16,6 @@ public byte[] getEncoded(){
         return this.encoded;
     }
 
-
     public String getName() {
         return this.name;
     }

Back-end/src/main/java/Controller/ServerControllers/DraftPageController.java

@@ -80,12 +80,15 @@ ArrayList<EmailI> searchDraft(@RequestParam(value = "username") String username,
     @DeleteMapping("/deleteForeverDraft")
     ArrayList<EmailI> deleteForever(@RequestBody Email email){
         try{
-            FifthHandler.getInstance().handle("DeleteForever", email, "");
+
+            FirstHandler.getInstance().handle("DeleteForever", email, "");
+
             return null;
         }
         catch (Exception e){
             System.out.println(e.getMessage());
             return null;
         }
     }
+
 }

Back-end/src/main/java/Controller/ServerControllers/InboxPageController.java

@@ -23,6 +23,7 @@ ArrayList<EmailI> movetoTrash(@RequestBody Email email){
         try{
             FirstHandler.getInstance().handle("MovetoTrash",email, "");
             return null;
+
         }
         catch (Exception e){
             System.out.println(e.getMessage());

Back-end/src/main/java/Controller/ServerControllers/SendEmailPageController.java

@@ -11,13 +11,15 @@
 import java.io.File;
 import java.util.ArrayList;
 
+
 import Controller.SingletonClasses.Handlers.FirstHandler;
 
 
 @RestController
 @CrossOrigin(origins = "http://localhost:4200")
 public class SendEmailPageController {
 
+
     @PostMapping("/sendEmail")
     String sendEmail(@RequestBody Email email){
         try{
@@ -31,13 +33,14 @@ String sendEmail(@RequestBody Email email){
     }
 
     @PostMapping("/sendEmailAttachments")
-    void attachment(@RequestParam(value = "email") String email, @RequestParam("file") MultipartFile[] files){
-        try{
+    void attachment(@RequestParam(value = "email") String email, @RequestParam("file") MultipartFile[] files) {
+        try {
             ObjectMapper map = new ObjectMapper();
             EmailI newEmail = map.readValue(email, Email.class);
             newEmail.setAttachments(new ArrayList<Attachment>());
-            if(files != null){
-                for(int i = 0; i < files.length; i++){
+            if (files != null) {
+                for (int i = 0; i < files.length; i++) {
+
                     Attachment attachment = new Attachment();
                     attachment.setEncoded(files[i].getBytes());
                     System.out.println(files[i].getOriginalFilename());
@@ -51,10 +54,8 @@ void attachment(@RequestParam(value = "email") String email, @RequestParam("file
             }
 
             FirstHandler.getInstance().handle("SendEmail", newEmail, "");
+        } catch (Exception e) {
 
-
-        }
-        catch (Exception e){
             System.out.println(e.getMessage());
         }
     }

Back-end/src/main/java/Controller/ServerControllers/TrashPageController.java

@@ -8,6 +8,7 @@
 import Controller.SingletonClasses.Database;
 import Controller.SingletonClasses.Handlers.FifthHandler;
 import Controller.SingletonClasses.Handlers.FirstHandler;
+
 import Controller.Sorter.EmailsSorter;
 import Controller.Sorter.EmailsSorterI;
 import org.springframework.web.bind.annotation.*;
@@ -78,6 +79,7 @@ ArrayList<EmailI> deleteForever(@RequestBody Email email){
     @PostMapping("/restore")
     ArrayList<EmailI> restore(@RequestBody Email email){
         try{
+            System.out.println("OWNER CONTOLEER " + email.getOwner());
             FirstHandler.getInstance().handle("Restore", email, "");
             return null;
         }

Back-end/src/main/java/Controller/ServerControllers/UserFoldersPageController.java

@@ -47,6 +47,7 @@ ArrayList<ProfileFolderI> getAllFolders(@RequestParam(value = "username") String
 
     @PostMapping("/addFolder")
     ArrayList<ProfileFolderI> addUserFolder(@RequestParam("username") String username, @RequestBody String folderName){
+
         try{
             Creator.getInstance().createProfileFolder(folderName, Database.getInstance().getProfilebyUsername("", username));
             return Database.getInstance().getProfilebyUsername("", username).getFolders();
@@ -82,7 +83,7 @@ String moveToFolder(@RequestBody Email email, @RequestParam(value = "username")
     @PostMapping("/moveToTrashFolder")
     ArrayList<EmailI> movetoTrash(@RequestBody Email email, @RequestParam(value = "foldername") String folderName){
         try{
-            FirstHandler.getInstance().handle("MovetoTrash",email, "");
+            FirstHandler.getInstance().handle("MovetoTrash",email, folderName);
             return Database.getInstance().getProfilebyUsername("", email.getOwner()).getProfileFolderbyName(folderName).getEmails();
         }
         catch (Exception e){

Back-end/src/main/java/Controller/SingletonClasses/Handlers/FifthHandler.java

@@ -24,9 +24,18 @@ public static FifthHandler getInstance(){
     @Override
     public void handle(String concern, EmailI email, String folderName) throws Exception {
         if(concern == this.concern){
+
             Database database = Database.getInstance();
-            Deleter.getInstance().deleteEmailDataTrash(email, database.getProfilebyUsername("", email.getOwner()));
-            database.getProfilebyUsername("", email.getOwner()).getTrash().removeEmailbyID(email.getEmailID());
+
+            if(email.getEmailType().equals("Draft")){
+                Deleter.getInstance().deleteEmailDataDraft(email, database.getProfilebyUsername("", email.getOwner()));
+                database.getProfilebyUsername("", email.getOwner()).getDraft().removeEmailbyID(email.getEmailID());
+            }
+            else{
+                Deleter.getInstance().deleteEmailDataTrash(email, database.getProfilebyUsername("", email.getOwner()));
+                database.getProfilebyUsername("", email.getOwner()).getTrash().removeEmailbyID(email.getEmailID());
+            }
+
 
         }else{
             if(this.successor == null){

Back-end/src/main/java/Controller/SingletonClasses/Handlers/FourthHandler.java

@@ -32,27 +32,18 @@ public void handle(String concern, EmailI email, String folderName) throws Excep
             }
             ProfileI owner = database.getProfilebyUsername("", email.getOwner());
 
+            String ID = UUID.randomUUID().toString();
 
             if(email.getEmailType().equals("Inbox")){
-                Creator.getInstance().createEmailDataProfileFolder(email, owner, folderName, email.getEmailID());
-                Deleter.getInstance().deleteEmailDataInbox(email, owner);
-                owner.getInbox().removeEmailbyID(email.getEmailID());
-                owner.getProfileFolderbyName(folderName).addEmail(email);
+                owner.getProfileFolderbyName(folderName).addEmail(Creator.getInstance().createEmailDataProfileFolder(email, owner, folderName, ID));
 
             }
             if(email.getEmailType().equals("Sent")){
-                Creator.getInstance().createEmailDataProfileFolder(email, owner, folderName, email.getEmailID());
-                Deleter.getInstance().deleteEmailDataSent(email, owner);
-                owner.getSent().removeEmailbyID(email.getEmailID());
-                owner.getProfileFolderbyName(folderName).addEmail(email);
-
+                owner.getProfileFolderbyName(folderName).addEmail(Creator.getInstance().createEmailDataProfileFolder(email, owner, folderName, ID));
 
             }
             if(email.getEmailType().equals("Draft")){
-                Creator.getInstance().createEmailDataProfileFolder(email, owner, folderName, email.getEmailID());
-                Deleter.getInstance().deleteEmailDataDraft(email, owner);
-                owner.getDraft().removeEmailbyID(email.getEmailID());
-                owner.getProfileFolderbyName(folderName).addEmail(email);
+                owner.getProfileFolderbyName(folderName).addEmail(Creator.getInstance().createEmailDataProfileFolder(email, owner, folderName, ID));
             }
 
         }else{

Back-end/src/main/java/Controller/SingletonClasses/Handlers/SecondHandler.java

@@ -55,10 +55,10 @@ public void handle(String concern, EmailI email, String folderName) throws Excep
             }
             if(folderName != ""){
                 System.out.println("INSIDE INBOX MOVE TO TRASH");
-                Creator.getInstance().createEmailDataProfileFolder(email, owner, folderName, email.getEmailID());
+
                 Deleter.getInstance().deleteEmailProfileFolder(owner, folderName, email);
                 owner.getProfileFolderbyName(folderName).removeEmailbyID(email.getEmailID());
-                owner.getTrash().addEmail(email);
+
             }
 
         }else{

Back-end/src/main/java/Controller/SingletonClasses/Handlers/SixthHandler.java

@@ -24,11 +24,12 @@ public static SixthHandler getInstance(){
     public void handle(String concern, EmailI email, String folderName) throws Exception {
         if(concern == this.concern){
             Database database = Database.getInstance();
+
             Deleter.getInstance().deleteEmailDataTrash(email, database.getProfilebyUsername("", email.getOwner()));
             database.getProfilebyUsername("", email.getOwner()).getTrash().removeEmailbyID(email.getEmailID());
 
             if(email.getEmailType().equals("Inbox")){
-                Creator.getInstance().createEmailDataInbox(email, database.getProfilebyUsername("", email.getOwner()), email.getEmailID(), -1);
+                Creator.getInstance().createEmailDataInbox(email, database.getProfilebyUsername("", email.getOwner()), email.getEmailID(), 0);
                 database.getProfilebyUsername("", email.getOwner()).getInbox().addEmail(email);
             }
             if(email.getEmailType().equals("Sent")){

Back-end/src/main/java/Model/Database/Joe$2001/Inbox/7968833a-4309-48da-b9a1-036150cb0db3.json

@@ -0,0 +1 @@
+{"subject":"lol","body":"lolita","owner":"Joe","senderUsername":"Meniem","receiversUsernames":["Joe"],"priority":"Urgent","timeSent":"1640747429506","timeSentString":"Dec 29, 2021, 5:10:29 AM","emailID":"7968833a-4309-48da-b9a1-036150cb0db3","emailType":"Inbox","attachments":null}

Back-end/src/main/java/Model/Database/Joe$2001/Inbox/de0b16cf-5b3d-4e36-af88-ef0e08ae472b.json

@@ -0,0 +1 @@
+{"subject":"Life","body":"I have an Existential Crisis","owner":"Joe","senderUsername":"Meniem","receiversUsernames":["Joe"],"priority":"Important","timeSent":"1640741520482","timeSentString":"Dec 29, 2021, 3:32:00 AM","emailID":"de0b16cf-5b3d-4e36-af88-ef0e08ae472b","emailType":"Inbox","attachments":null}

Back-end/src/main/java/Model/Database/Joe$2001/Sent/005aa372-d07c-4c96-82fe-3f81ac08cf6c.json

@@ -0,0 +1 @@
+{"subject":"BAAAS","body":"KEFAYAAAAAAAA","owner":"Joe","senderUsername":"Joe","receiversUsernames":["Meniem"],"priority":"Important","timeSent":"1640746152714","timeSentString":"Dec 29, 2021, 4:49:12 AM","emailID":"005aa372-d07c-4c96-82fe-3f81ac08cf6c","emailType":"Sent","attachments":null}

Back-end/src/main/java/Model/Database/Joe$2001/Sent/0727981d-0eed-4343-89b2-d3fa43af1f87.json

@@ -0,0 +1 @@
+{"subject":"BAAAS","body":"KEFAYAAAAAAAA","owner":"Joe","senderUsername":"Joe","receiversUsernames":["Meniem"],"priority":"Important","timeSent":"1640746151216","timeSentString":"Dec 29, 2021, 4:49:11 AM","emailID":"0727981d-0eed-4343-89b2-d3fa43af1f87","emailType":"Sent","attachments":null}

Back-end/src/main/java/Model/Database/Joe$2001/Sent/0de8fad0-0bec-4ebb-8c38-4dc6ecf6997d.json

@@ -0,0 +1 @@
+{"subject":"ray","body":"bay","owner":"Joe","senderUsername":"Joe","receiversUsernames":["Meniem"],"priority":"Important","timeSent":"1640745315397","timeSentString":"Dec 29, 2021, 4:35:15 AM","emailID":"0de8fad0-0bec-4ebb-8c38-4dc6ecf6997d","emailType":"Sent","attachments":null}

Back-end/src/main/java/Model/Database/Joe$2001/Sent/3b6840e2-c90b-4ce3-ab5f-28e80f3f5f63.json

@@ -0,0 +1 @@
+{"subject":"BAAAS","body":"KEFAYAAAAAAAA","owner":"Joe","senderUsername":"Joe","receiversUsernames":["Meniem"],"priority":"Important","timeSent":"1640746151742","timeSentString":"Dec 29, 2021, 4:49:11 AM","emailID":"3b6840e2-c90b-4ce3-ab5f-28e80f3f5f63","emailType":"Sent","attachments":null}

Back-end/src/main/java/Model/Database/Joe$2001/Sent/44b2fabe-5bdd-499b-9a64-4c5222d56aaf.json

@@ -0,0 +1 @@
+{"subject":"TAY","body":"DSG FGF FDG FD DGF ","owner":"Joe","senderUsername":"Joe","receiversUsernames":["Meniem"],"priority":"Important","timeSent":"1640744612390","timeSentString":"Dec 29, 2021, 4:23:32 AM","emailID":"44b2fabe-5bdd-499b-9a64-4c5222d56aaf","emailType":"Sent","attachments":null}

Back-end/src/main/java/Model/Database/Joe$2001/Sent/6babf466-ae15-46eb-bc34-9c51d649586e.json

@@ -0,0 +1 @@
+{"subject":"BAAAS","body":"KEFAYAAAAAAAA","owner":"Joe","senderUsername":"Joe","receiversUsernames":["Meniem"],"priority":"Important","timeSent":"1640746152257","timeSentString":"Dec 29, 2021, 4:49:12 AM","emailID":"6babf466-ae15-46eb-bc34-9c51d649586e","emailType":"Sent","attachments":null}

Back-end/src/main/java/Model/Database/Joe$2001/Sent/9508e94a-7044-4ad0-8817-5dd9163496fd.json

@@ -0,0 +1 @@
+{"subject":"haeh d","body":"f hfdh fdh dfh fd hfdh ","owner":"Joe","senderUsername":"Joe","receiversUsernames":["Meniem"],"priority":"Important","timeSent":"1640744185660","timeSentString":"Dec 29, 2021, 4:16:25 AM","emailID":"9508e94a-7044-4ad0-8817-5dd9163496fd","emailType":"Sent","attachments":null}

Back-end/src/main/java/Model/Database/Joe$2001/Sent/e07e778a-f7b6-4c55-9255-367777d20126.json

@@ -0,0 +1 @@
+{"subject":"haeh d","body":"f hfdh fdh dfh fd hfdh ","owner":"Joe","senderUsername":"Joe","receiversUsernames":["Meniem"],"priority":"Important","timeSent":"1640744234498","timeSentString":"Dec 29, 2021, 4:17:14 AM","emailID":"e07e778a-f7b6-4c55-9255-367777d20126","emailType":"Sent","attachments":null}

Back-end/src/main/java/Model/Database/Joe$2001/Sent/e24f299b-cdb4-4542-b1de-3c50fe79a9f4.json

@@ -0,0 +1 @@
+{"subject":"Hey","body":"Ray Bay Hey Gay","owner":"Joe","senderUsername":"Joe","receiversUsernames":["Meniem"],"priority":"Important","timeSent":"1640742382961","timeSentString":"Dec 29, 2021, 3:46:22 AM","emailID":"e24f299b-cdb4-4542-b1de-3c50fe79a9f4","emailType":"Sent","attachments":null}

Back-end/src/main/java/Model/Database/Joe$2001/Sent/e4d9e434-a841-46fe-a70a-b47a03c96ebf.json

@@ -0,0 +1 @@
+{"subject":"Please Work","body":"I want you to delete","owner":"Joe","senderUsername":"Joe","receiversUsernames":["Meniem"],"priority":"Important","timeSent":"1640745020138","timeSentString":"Dec 29, 2021, 4:30:20 AM","emailID":"e4d9e434-a841-46fe-a70a-b47a03c96ebf","emailType":"Sent","attachments":null}

Back-end/src/main/java/Model/Database/Joe$2001/Sent/ef19005a-00b1-4e57-8033-b5f2712b7ed6.json

@@ -0,0 +1 @@
+{"subject":"BAAAS","body":"KEFAYAAAAAAAA","owner":"Joe","senderUsername":"Joe","receiversUsernames":["Meniem"],"priority":"Important","timeSent":"1640745497788","timeSentString":"Dec 29, 2021, 4:38:17 AM","emailID":"ef19005a-00b1-4e57-8033-b5f2712b7ed6","emailType":"Sent","attachments":null}

Back-end/src/main/java/Model/Database/Meniem$2001/Contacts/Joe.json

@@ -0,0 +1 @@
+{"username":"Joe","emailAddresses":["outlook","lol","youssef.okab@gmail.com"]}

Back-end/src/main/java/Model/Database/Meniem$2001/Contacts/deffo.json

@@ -0,0 +1 @@
+{"username":"deffo","emailAddresses":["emailme","test"]}

Back-end/src/main/java/Model/Database/Meniem$2001/Contacts/usefsaeed.json

@@ -0,0 +1 @@
+{"username":"usefsaeed","emailAddresses":["youssef.okab@gmail.com","youssef.okab@gmail.com","lol","dah hyban","dah msh hyban","ahma"]}