Email service and systems are updated for visitor report.

Author: 0xkerem

app/src/components/Chat.js

@@ -2,6 +2,7 @@ import React, { useState, useEffect } from 'react';
 import axios from 'axios';
 
 export default function Chat({ botId }) {
+  const [chatId, setChatId] = useState(-1);
   const [botName, setBotName] = useState('');
   const [messages, setMessages] = useState([]);
   const [inputText, setInputText] = useState('');
@@ -20,7 +21,7 @@ export default function Chat({ botId }) {
   const generateCode = () => {
     const generatedCode = `
       <div id="semantiq-chatbot"></div>
-      <script data-bot-id="${botId}" defer="defer" src="http://localhost:8080/static/main.ea9881ca.js"></script>
+      <script data-bot-id="${botId}" defer="defer" src="http://localhost:8080/static/main.57a7bb31.js"></script>
       <script>
         var link = document.createElement("link");
         link.href = "http://localhost:8080/static/main.ba187d75.css";
@@ -51,9 +52,33 @@ export default function Chat({ botId }) {
     sendVote(1);
   };
 
-  const voteNegative = () => {
-    sendVote(-1);
-  };
+const voteNegative = async () => {
+  sendVote(-1);
+  const userEmail = prompt('If you want to contact a real person, leave your email address, otherwise leave it blank.');
+  
+  if (userEmail) {
+      const data = {
+          chatId: chatId,
+          userEmail: userEmail,
+          chatBotId: botId
+      };
+
+      try {
+          const response = await axios.post('http://localhost:8080/api/email/report', data);
+          
+          if (response.status === 200) {
+              // Request successful, do something
+              console.log('Email reported successfully');
+          } else {
+              console.error('Failed to report email');
+          }
+      } catch (error) {
+          // Handle errors
+          console.error('Error:', error);
+      }
+  }
+};
+
 
   const sendVote = (vote) => {
     // Determine the chatId for the vote
@@ -62,7 +87,6 @@ export default function Chat({ botId }) {
     // Sending a POST request to vote
     axios.post(`http://localhost:8080/api/botdata/${botId}/chats/${chatId}/${vote}`)
       .then(response => {
-        // Handle successful vote response if needed
         console.log(`Voted ${vote === 1 ? 'positive' : 'negative'}`);
       })
       .catch(error => {
@@ -72,35 +96,39 @@ export default function Chat({ botId }) {
 
   const sendMessage = (e) => {
     e.preventDefault();
-  
+
     if (inputText.trim() === '') return;
-  
+
     // Update messages state with the user message immediately
     const newUserMessage = { text: inputText, sender: 'user' };
     setMessages([...messages, newUserMessage]);
     setInputText('');
-  
+
     // Send user message to the server via Axios POST request
-    const chatId = messages.length === 0 ? -1 : messages[messages.length - 1].chatId;
-    axios.post(`http://localhost:8080/api/bots/${botId}/chat/${chatId}`, {
+    const currentChatId = messages.length === 0 ? -1 : messages[messages.length - 1].chatId;
+    axios
+      .post(`http://localhost:8080/api/bots/${botId}/chat/${currentChatId}`, {
         question: inputText,
       })
-      .then(response => {
+      .then((response) => {
         let newAssistantMessage = response.data.answer.content;
         const newChatId = response.data.chatId;
-  
+
         // Remove unwanted content if it exists in the assistant's message
         if (newAssistantMessage.startsWith('{"content":"') && newAssistantMessage.endsWith('"}')) {
           newAssistantMessage = newAssistantMessage.substring(12, newAssistantMessage.length - 2);
         }
-  
+
+        // Update chatId state with the new chatId
+        setChatId(newChatId);
+
         // Update messages state with the new assistant message, preserving previous messages
-        setMessages(prevMessages => [
+        setMessages((prevMessages) => [
           ...prevMessages,
           { text: newAssistantMessage, sender: 'assistant', chatId: newChatId },
         ]);
       })
-      .catch(error => {
+      .catch((error) => {
         console.error('Error sending message:', error);
       });
   };

server/src/main/java/com/semantiq/server/DTO/ReportEmailDTO.java

@@ -0,0 +1,42 @@
+package com.semantiq.server.DTO;
+
+public class ReportEmailDTO {
+    private int chatId;
+    private String userEmail;
+    private int chatBotId;
+
+    // Constructors
+    public ReportEmailDTO() {
+    }
+
+    public ReportEmailDTO(int chatId, String userEmail, int chatBotId) {
+        this.chatId = chatId;
+        this.userEmail = userEmail;
+        this.chatBotId = chatBotId;
+    }
+
+    // Getters and setters
+    public int getChatId() {
+        return chatId;
+    }
+
+    public void setChatId(int chatId) {
+        this.chatId = chatId;
+    }
+
+    public String getUserEmail() {
+        return userEmail;
+    }
+
+    public void setUserEmail(String userEmail) {
+        this.userEmail = userEmail;
+    }
+
+    public int getChatBotId() {
+        return chatBotId;
+    }
+
+    public void setChatBotId(int chatBotId) {
+        this.chatBotId = chatBotId;
+    }
+}

server/src/main/java/com/semantiq/server/controller/EmailController.java

@@ -1,27 +1,44 @@
 package com.semantiq.server.controller;
 
+import com.semantiq.server.DTO.ReportEmailDTO;
+import com.semantiq.server.service.ChatBotService.ChatBotService;
 import com.semantiq.server.service.EmailService;
 import com.semantiq.server.service.UserService;
+import jakarta.mail.MessagingException;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 @Controller
 @RequestMapping("/api/email")
+@CrossOrigin(origins = "*")
 public class EmailController {
     private final EmailService emailService;
     private final UserService userService;
+    private final ChatBotService chatBotService;
 
     @Autowired
-    public EmailController(EmailService emailService, UserService userService) {
+    public EmailController(EmailService emailService, UserService userService, ChatBotService chatBotService) {
         this.emailService = emailService;
         this.userService = userService;
+        this.chatBotService = chatBotService;
     }
 
-    @PostMapping("/send")
-    public ResponseEntity <?> sendEmail(@RequestParam int userId, @RequestParam String message) {
+    @PostMapping("/report")
+    public ResponseEntity<?> sendReportEmail(@RequestBody ReportEmailDTO reportEmailDTO) {
+        try {
+            if (chatBotService.findChatBotById(reportEmailDTO.getChatBotId()) == null) {
+                return new ResponseEntity<>("Bot not found", HttpStatus.NOT_FOUND);
+            }
 
-        return null;
+            String ownerEmail = chatBotService.findChatBotById(reportEmailDTO.getChatBotId()).getOwner().getEmail();
+            emailService.sendReport(reportEmailDTO.getUserEmail(), ownerEmail, reportEmailDTO.getChatId());
+            return new ResponseEntity<>("Mail sent.", HttpStatus.OK);
+        } catch (MessagingException e) {
+            return new ResponseEntity<>("Failed to send email.", HttpStatus.INTERNAL_SERVER_ERROR);
+        }
     }
+
 }

server/src/main/java/com/semantiq/server/service/EmailService.java

@@ -26,15 +26,32 @@ public EmailService(JavaMailSender javaMailSender, UserRepo userRepo) {
     public void sendVerificationCode(String recipientEmail) throws MessagingException {
         int verificationCode = userRepo.findByEmail(recipientEmail).getVerificationCode();
         String subject = "Verification Code";
-        String message = "Your verification code is: " + String.valueOf(verificationCode);
+        String message = "Your verification code is: " + String.valueOf(verificationCode) +
+                "\nEnter the code in the box on the sign-up screen or try logging in with this email to re-enter the code.";
 
         MimeMessage mimeMessage = javaMailSender.createMimeMessage();
         MimeMessageHelper helper = new MimeMessageHelper(mimeMessage, "utf-8");
-        helper.setFrom("your_email@example.com");
+        helper.setFrom("semantiq.app@gmail.com");
         helper.setTo(recipientEmail);
         helper.setSubject(subject);
         helper.setText(message, true);
 
         javaMailSender.send(mimeMessage);
     }
+
+    // New method for sending a report to the owner when the user is dissatisfied
+    public void sendReport(String userEmail, String ownerEmail, int chatId) throws MessagingException {
+        String subject = "User Dissatisfaction Report";
+        String message = "User with email " + userEmail + " is dissatisfied with the chatbot's answer.\n"
+                + "Chat ID: " + chatId + "\n\nPlease review the conversation history on your panel.";
+
+        MimeMessage mimeMessage = javaMailSender.createMimeMessage();
+        MimeMessageHelper helper = new MimeMessageHelper(mimeMessage, "utf-8");
+        helper.setFrom("semantiq.app@gmail.com");
+        helper.setTo(ownerEmail);
+        helper.setSubject(subject);
+        helper.setText(message, true);
+
+        javaMailSender.send(mimeMessage);
+    }
 }

server/src/main/java/com/semantiq/server/service/configuration/WebConfig.java

@@ -28,6 +28,13 @@ public void addCorsMappings(CorsRegistry registry) {
                 .allowedMethods("GET", "POST", "PUT", "DELETE")
                 // Add more configurations if needed
                 .allowCredentials(true);
+
+        // CORS configuration for /static/**
+        registry.addMapping("/api/email/")
+                .allowedOriginPatterns("*") // Use allowedOriginPatterns instead of allowedOrigins
+                .allowedMethods("GET", "POST", "PUT", "DELETE")
+                // Add more configurations if needed
+                .allowCredentials(true);
     }
 }