Fixed some userId issues as well as dependencies

avichaljadeja2002 · Dec 16, 2024 · 8133dfd · 8133dfd
1 parent 9bc6d7d
commit 8133dfd
Show file tree

Hide file tree

Showing 11 changed files with 286 additions and 503 deletions.
diff --git a/app/addCalendarEvents.tsx b/app/addCalendarEvents.tsx
@@ -6,7 +6,7 @@ import { cLog } from './log'
 
 export default function AddCalendarEvents() {
   const initialData = {
-    user_id: 1,
+    userId: 1,
     title: '',
     event_date: new Date(),
     event_time: new Date(),
@@ -30,6 +30,7 @@ export default function AddCalendarEvents() {
         repeating: Boolean(saveData.repeating),
         repeat_timeline: saveData.repeating
       };
+      cLog(payload);
       const hit = IPAddr + '/add_calendar_event';
       cLog('Saving event to:' + hit);
       const response = await axios.post(hit, payload);

diff --git a/app/addEventPage.tsx b/app/addEventPage.tsx
@@ -70,7 +70,6 @@ const GenericAddPageForm: React.FC<FormProps> = ({ title, initialData, fields, m
     handleChange('ingredients', selectedItems);
   };
 
-  cLog(formData)
   return (
     <ScrollView contentContainerStyle={styles.addContainer}>
       <Text style={styles.sectionHeader}>{title}</Text>

diff --git a/app/addFinanceEvents.tsx b/app/addFinanceEvents.tsx
@@ -6,7 +6,7 @@ import { cLog } from './log'
 
 export default function AddFinanceEvents() {
     const initialData = {
-        user_id: 1,
+        userId: 1,
         title: '',
         event_date: new Date(),
         event_time: new Date(),
@@ -30,6 +30,7 @@ export default function AddFinanceEvents() {
                 repeating: Boolean(saveData.repeating),
                 repeat_timeline: saveData.repeating
               };
+              cLog(payload);
               const hit = IPAddr + '/add_finance_events';
               cLog('Saving event to:' + hit);
             const response = await axios.post(hit, payload);

diff --git a/app/addHealthEvents.tsx b/app/addHealthEvents.tsx
@@ -6,7 +6,7 @@ import { cLog } from './log'
 
 export default function AddHealthEvents() {
   const initialData = {
-    user_id: 1,
+    userId: 1,
     title: '',
     event_date: new Date(),
     event_time: new Date(),
@@ -29,6 +29,7 @@ export default function AddHealthEvents() {
         repeating: Boolean(saveData.repeating),
         repeat_timeline: saveData.repeating
       };
+      cLog(payload);
       cLog('Payload:' + JSON.stringify(payload));
       const hit = IPAddr + '/add_health_events';
       cLog('Saving event to:' + hit);

diff --git a/app/addMeals.tsx b/app/addMeals.tsx
@@ -7,7 +7,7 @@ import { cLog } from './log'
 export default function AddMeals() {
   const [ingredients, setIngredients] = useState([]);
   const initialData = {
-    user_id: 1,
+    userId: 1,
     title: '',
     event_date: new Date(),
     event_time: new Date(),
@@ -53,6 +53,7 @@ export default function AddMeals() {
         repeat_timeline: saveData.repeating,
         ingredients: saveData.ingredients.join(','),
       };
+      cLog(payload);
       cLog('Payload:' + JSON.stringify(payload));
       const hit = IPAddr + '/add_meal_events';
       cLog('Saving event to:' + hit);

diff --git a/app/constants.js b/app/constants.js
@@ -1,6 +1,6 @@
 // export const IPAddr = "http://34.204.83.156:8080" // For AWS
-export const IPAddr = "http://137.112.197.195:8080" // For local testing on laptop
-export const logging = false;
+export const IPAddr = "http://137.112.196.239:8080" // For local testing on laptop
+export const logging = true;
 
 export const repeatingData = [
     { label: 'Daily', value: 1 },

diff --git a/backend/.idea/dataSources.local.xml b/backend/.idea/dataSources.local.xml
diff --git a/backend/omniplanner.db b/backend/omniplanner.db
diff --git a/backend/omniplanner/src/main/java/com/main/omniplanner/finance/FinanceEvents.java b/backend/omniplanner/src/main/java/com/main/omniplanner/finance/FinanceEvents.java
@@ -43,8 +43,8 @@ public int getUserId() {
         return userId;
     }
 
-    public void setUserId(int user_id) {
-        this.userId = user_id;
+    public void setUserId(int userId) {
+        this.userId = userId;
     }
 
     public String getTitle() {