ai assistant bug fix and user model update

tharoosha · Nov 1, 2023 · 6acbb8a · 6acbb8a
1 parent 7823148
commit 6acbb8a
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 14 deletions.
diff --git a/backend/models/User.model.js b/backend/models/User.model.js
@@ -32,6 +32,51 @@ export const UserSchema  = new mongoose.Schema({
     //     Saturday: { Joy: Number, Surprise: Number, Anger: Number, Sad: Number, Happy: Number },
     //     Sunday: { Joy: Number, Surprise: Number, Anger: Number, Sad: Number, Happy: Number },
     // },
+
+    emotions: {
+        Monday: { 
+            Joy: {type: Number}, 
+            Surprise: {type: Number}, 
+            Anger: {type: Number}, 
+            Sad: {type: Number}, 
+            Happy: {type: Number} },
+        Tuesday: { 
+            Joy: {type:Number}, 
+            Surprise: {type:Number}, 
+            Anger: {type:Number}, 
+            Sad: {type:Number}, 
+            Happy: {type:Number} },
+        Wednesday: { 
+            Joy: {type:Number}, 
+            Surprise: {type:Number}, 
+            Anger: {type:Number}, 
+            Sad: {type:Number}, 
+            Happy: {type:Number} },
+        Thursday: { 
+            Joy: {type:Number}, 
+            Surprise: {type:Number}, 
+            Anger: {type:Number}, 
+            Sad: {type:Number}, 
+            Happy: {type:Number} },
+        Friday: { 
+            Joy: {type:Number}, 
+            Surprise: {type:Number}, 
+            Anger: {type:Number}, 
+            Sad: {type:Number}, 
+            Happy: {type:Number} },
+        Saturday: { 
+            Joy: {type:Number}, 
+            Surprise: {type:Number}, 
+            Anger: {type:Number}, 
+            Sad: {type:Number}, 
+            Happy: {type:Number} },
+        Sunday: { 
+            Joy: {type:Number}, 
+            Surprise: {type:Number}, 
+            Anger: {type:Number}, 
+            Sad: {type:Number}, 
+            Happy: {type:Number} },
+    },
 });
 
 export default mongoose.model.Users || mongoose.model('User', UserSchema );
diff --git a/frontend/src/pages/AI_Assistant.js b/frontend/src/pages/AI_Assistant.js
@@ -122,8 +122,6 @@ const AI_Assistant = () => {
       setChatLog(updatedChatLog);
       // console.log('{$process.env.REACT_APP_SERVER_ENDPOINT}')
 
-
-
       setLoading(true);
 
       axios
@@ -133,24 +131,27 @@ const AI_Assistant = () => {
             setChatLog(updatedChatLogWithAI);
             setResponse(response.data.result);
             setLoading(false);
+
+            axios
+               .post(`http://localhost:5001/api/emotion_analyze`, { message: message })
+               .then((response) => {
+                  setEmotion(response.data.emotion);
+                  console.log(message)
+                  console.log(response.data.emotion);
+                  updateRecommendation({"recommendation" : response.data.emotion})
+                  console.log('database update done')
+               })
+               .catch((error) => console.error(error));
+
          })
          .catch((error) => {
             console.error(error);
             setLoading(false);
          });
 
-      axios
-         .post(`http://localhost:5001/api/emotion_analyze`, { message: message })
-         .then((response) => {
-            setEmotion(response.data.emotion);
-
-            console.log(emotion);
-            updateRecommendation({"recommendation" : emotion})
-            console.log('database update done')
-
-         })
-         .catch((error) => console.error(error));
-
+
+
+
       setMessage('');
    };