Pre-final

2 files changed, 101 insertions, 100 deletions

diff --git a/src/services/CommentService.ts b/src/services/CommentService.ts
new file mode 100644
index 00000000..3baf0305
--- /dev/null
+++ b/src/services/CommentService.ts
@@ -0,0 +1,101 @@
+import AsyncStorage from '@react-native-community/async-storage';
+import {Alert} from 'react-native';
+import {COMMENTS_ENDPOINT, COMMENT_THREAD_ENDPOINT} from '../constants';
+import {ERROR_FAILED_TO_COMMENT} from '../constants/strings';
+import {CommentType} from '../types';
+
+export const getComments = async (
+  objectId: string,
+  fetchThreads: boolean,
+): Promise<CommentType[]> => {
+  let comments: CommentType[] = [];
+  try {
+    const token = await AsyncStorage.getItem('token');
+    const endpoint = fetchThreads
+      ? COMMENT_THREAD_ENDPOINT + '?comment_id='
+      : COMMENTS_ENDPOINT + '?moment_id=';
+    const response = await fetch(endpoint + objectId, {
+      method: 'GET',
+      headers: {
+        Authorization: 'Token ' + token,
+      },
+    });
+    const status = response.status;
+    if (status === 200) {
+      comments = await response.json();
+      console.log(comments[0]);
+    } else {
+      console.log('Could not load comments');
+    }
+  } catch (error) {
+    console.log('Could not load comments', error);
+  }
+  return comments;
+};
+
+export const postComment = async (
+  comment: string,
+  objectId: string,
+  postThread: boolean,
+) => {
+  try {
+    const token = await AsyncStorage.getItem('token');
+    const request = new FormData();
+    request.append('comment', comment);
+    if (postThread) {
+      request.append('comment_id', objectId);
+    } else {
+      request.append('moment_id', objectId);
+    }
+    const endpoint = postThread ? COMMENT_THREAD_ENDPOINT : COMMENTS_ENDPOINT;
+    const response = await fetch(endpoint, {
+      method: 'POST',
+      headers: {
+        Authorization: 'Token ' + token,
+      },
+      body: request,
+    });
+    if (response.status !== 200) {
+      throw 'server error';
+    }
+    return await response.json();
+  } catch (error) {
+    Alert.alert(ERROR_FAILED_TO_COMMENT);
+    return undefined;
+  }
+};
+
+//Get count of comments for a moment
+export const getCommentsCount = async (
+  objectId: string,
+  fetchThread: boolean,
+): Promise<string> => {
+  let comments_count: string = '';
+  try {
+    const token = await AsyncStorage.getItem('token');
+    const endpoint = fetchThread ? COMMENT_THREAD_ENDPOINT : COMMENTS_ENDPOINT;
+    const response = await fetch(endpoint + `${objectId}/`, {
+      method: 'GET',
+      headers: {
+        Authorization: 'Token ' + token,
+      },
+    });
+    const status = response.status;
+    if (status === 200) {
+      const response_data = await response.json();
+      comments_count = response_data.count;
+    } else {
+      console.log(
+        'Something went wrong! 😭',
+        'Not able to retrieve comments count',
+      );
+    }
+  } catch (error) {
+    console.log(
+      'Something went wrong! 😭',
+      'Not able to retrieve comments count',
+      error,
+    );
+  }
+  return comments_count;
+};
diff --git a/src/services/MomentServices.ts b/src/services/MomentServices.ts
index 8399eea3..0110a0d6 100644
--- a/src/services/MomentServices.ts
+++ b/src/services/MomentServices.ts
@@ -1,109 +1,9 @@
-import {CommentType} from './../types/types';
 import AsyncStorage from '@react-native-community/async-storage';
-<<<<<<< Updated upstream
-import {Alert} from 'react-native';
-import RNFetchBlob from 'rn-fetch-blob';
-import {
-  COMMENTS_ENDPOINT,
-  MOMENTS_ENDPOINT,
-  MOMENT_THUMBNAIL_ENDPOINT,
-} from '../constants';
-import {ERROR_FAILED_TO_COMMENT} from '../constants/strings';
-import {MomentType} from '../types';
-import {checkImageUploadStatus} from '../utils';
-
-//Get all comments for a moment
-export const getMomentComments = async (
-  momentId: string,
-): Promise<CommentType[]> => {
-  let comments: CommentType[] = [];
-  try {
-    const token = await AsyncStorage.getItem('token');
-    const response = await fetch(COMMENTS_ENDPOINT + '?moment_id=' + momentId, {
-      method: 'GET',
-      headers: {
-        Authorization: 'Token ' + token,
-      },
-    });
-    const status = response.status;
-    if (status === 200) {
-      comments = await response.json();
-    } else {
-      console.log('Could not load comments');
-    }
-  } catch (error) {
-    console.log('Could not load comments', error);
-  }
-  return comments;
-};
-
-export const postMomentComment = async (
-  commenter: string,
-  comment: string,
-  momentId: string,
-) => {
-  try {
-    const token = await AsyncStorage.getItem('token');
-    const request = new FormData();
-    request.append('moment_id', momentId);
-    request.append('commenter', commenter);
-    request.append('comment', comment);
-    const response = await fetch(COMMENTS_ENDPOINT, {
-      method: 'POST',
-      headers: {
-        Authorization: 'Token ' + token,
-      },
-      body: request,
-    });
-    if (response.status !== 200) {
-      throw 'server error';
-    }
-    return await response.json();
-  } catch (error) {
-    Alert.alert(ERROR_FAILED_TO_COMMENT);
-    return undefined;
-  }
-};
-
-//Get count of comments for a moment
-export const getMomentCommentsCount = async (
-  momentId: string,
-  callback: Function,
-) => {
-  try {
-    const token = await AsyncStorage.getItem('token');
-    const response = await fetch(COMMENTS_ENDPOINT + `${momentId}/`, {
-      method: 'GET',
-      headers: {
-        Authorization: 'Token ' + token,
-      },
-    });
-    const status = response.status;
-    if (status === 200) {
-      const response_data = await response.json();
-      callback(response_data.count);
-    } else {
-      console.log(
-        'Something went wrong! 😭',
-        'Not able to retrieve comments count',
-      );
-    }
-  } catch (error) {
-    console.log(
-      'Something went wrong! 😭',
-      'Not able to retrieve comments count',
-      error,
-    );
-  }
-};
-
-=======
 import RNFetchBlob from 'rn-fetch-blob';
 import {MOMENTS_ENDPOINT, MOMENT_THUMBNAIL_ENDPOINT} from '../constants';
 import {MomentType} from '../types';
 import {checkImageUploadStatus} from '../utils';
 
->>>>>>> Stashed changes
 export const postMoment: (
   fileName: string,
   uri: string,