Merge branch 'julius-dev' of Software_Engineering_I/greenvironment-frontend into master

src/app/components/feed/feed.component.ts

@@ -70,7 +70,7 @@ export class FeedComponent implements OnInit {
    */
   createPost(postElement, activityId: string) {
     if (postElement && activityId && this.checked) {
-      this.feedService.createPostActivity(postElement.value, activityId).subscribe(() => {
+      this.feedService.createPostActivity(postElement.value, activityId, this.file).subscribe(() => {
         postElement.value = '';
         this.textInputValue = '';
         this.checked = false;
@@ -82,7 +82,7 @@ export class FeedComponent implements OnInit {
         this.errorMessage = error.error.errors[0].message;
       });
     } else if (postElement) {
-      this.feedService.createPost(postElement.value).subscribe(() => {
+      this.feedService.createPost(postElement.value, this.file).subscribe(() => {
         postElement.value = '';
         this.textInputValue = '';
         this.checked = false;

src/app/models/post.ts

@@ -12,6 +12,7 @@ export class Post {
   deletable: boolean;
   author: Author;
   activity: Activity;
+  mediaUrl: string;
 
   constructor(
     id: number,
@@ -23,7 +24,8 @@ export class Post {
     deletable: boolean,
     date: string,
     author: Author,
-    activity: Activity
+    activity: Activity,
+    mediaUrl?: string,
   ) {
     this.id = id;
     this.content = content;
@@ -35,5 +37,6 @@ export class Post {
     this.date = date;
     this.author = author;
     this.activity = activity;
+    this.mediaUrl = mediaUrl;
   }
 }

src/app/services/feed/feed.service.ts

@@ -4,10 +4,11 @@ import {Post} from 'src/app/models/post';
 import {Author} from 'src/app/models/author';
 import {environment} from 'src/environments/environment';
 import {Activity} from 'src/app/models/activity';
-import {BehaviorSubject} from 'rxjs';
+import {BehaviorSubject, Observable} from 'rxjs';
 import {tap} from 'rxjs/operators';
 import {BaseService} from '../base.service';
 import {formatDate} from '@angular/common';
+import {IFileUploadResult} from '../../models/interfaces/IFileUploadResult';
 
 const createPostGqlQuery = `mutation($content: String!) {
   createPost(content: $content) {
@@ -138,47 +139,68 @@ export class FeedService extends BaseService {
   /**
    * Creates a new post
    * @param pContent
+   * @param file
    */
-  public createPost(pContent: String) {
+  public createPost(pContent: String, file?: File) {
     const body = {
       query: createPostGqlQuery,
       variables: {
         content: pContent
       }
     };
-    return this.createPostRequest(body);
+    return this.createPostRequest(body, file);
   }
 
   /**
    * Creates a post with an activity
    * @param pContent
    * @param activityId
+   * @param file
    */
-  public createPostActivity(pContent: String, activityId: String) {
+  public createPostActivity(pContent: String, activityId: String, file?: File) {
     const body = {
       query: createPostActivityGqlQuery, variables: {
         content: pContent,
         id: activityId
       }
     };
-    return this.createPostRequest(body);
+    return this.createPostRequest(body, file);
   }
 
   /**
    * Creates a new post with a given request.
    * @param body
+   * @param file - a file that is being uploaded with the post
    */
-  private createPostRequest(body: { variables: any; query: string }) {
+  private createPostRequest(body: { variables: any; query: string }, file?: File) {
     return this.postGraphql(body, null, 0)
       .pipe(tap(response => {
         if (this.activePostList === Sort.NEW) {
           const updatedPosts = this.posts.getValue();
-          updatedPosts.unshift(this.constructPost(response));
+          const post = this.constructPost(response);
+          updatedPosts.unshift(post);
           this.posts.next(updatedPosts);
+          if (file) {
+            this.uploadPostImage(post.id, file).subscribe((result) => {
+              post.mediaUrl = result.fileName;
+            });
+          }
         }
       }));
   }
 
+  /**
+   * Uploads a file for a post
+   * @param postId
+   * @param file
+   */
+  private uploadPostImage(postId: number, file: File): Observable<IFileUploadResult> {
+    const formData = new FormData();
+    formData.append('postMedia', file);
+    formData.append('postId', postId.toString());
+    return this.post<IFileUploadResult>(environment.greenvironmentUrl + '/upload', formData);
+  }
+
   /**
    * Upvotes a post
    * @param postId