Merge pull request #343 from deckgo/content-publish-api

feat: update studio to publish content to new api

Author: peterpeterparker

studio/src/app/handlers/editor/events/deck/deck-events.handler.tsx

@@ -21,7 +21,6 @@ import {DeckEditorService} from '../../../../services/editor/deck/deck-editor.se
 import {AuthService} from '../../../../services/auth/auth.service';
 import {DeckService} from '../../../../services/data/deck/deck.service';
 import {SlideService} from '../../../../services/data/slide/slide.service';
-import {ApiSlideService} from '../../../../services/api/slide/api.slide.service';
 
 export class DeckEventsHandler {
 
@@ -43,8 +42,6 @@ export class DeckEventsHandler {
     private deckService: DeckService;
     private slideService: SlideService;
 
-    private apiSlideService: ApiSlideService;
-
     constructor() {
         this.errorService = ErrorService.getInstance();
         this.busyService = BusyService.getInstance();
@@ -55,8 +52,6 @@ export class DeckEventsHandler {
 
         this.deckService = DeckService.getInstance();
         this.slideService = SlideService.getInstance();
-
-        this.apiSlideService = ApiSlideService.getInstance();
     }
 
     init(el: HTMLElement): Promise<void> {
@@ -471,15 +466,12 @@ export class DeckEventsHandler {
                         const slide: Slide = await this.slideService.get(deck.id, slideId);
 
                         if (slide && slide.data) {
-                            // 1. If needed, delete slide in the API
-                            await this.deleteApiSlide(deck, slide);
-
-                            // TODO: no rush but ultimately maybe should we move step 2. and 3. below in a cloud function?
+                            // TODO: no rush but ultimately maybe should we move step 1. and 2. below in a cloud function?
 
-                            // 2. Delete the slide in Firestore
+                            // 1. Delete the slide in Firestore
                             await this.slideService.delete(deck.id, slideId);
 
-                            // 3. Update list of slide in the deck (in Firestore)
+                            // 2. Update list of slide in the deck (in Firestore)
                             if (deck.data.slides && deck.data.slides.indexOf(slideId) > -1) {
                                 deck.data.slides.splice(deck.data.slides.indexOf(slideId), 1);
 
@@ -503,28 +495,6 @@ export class DeckEventsHandler {
         });
     }
 
-    private deleteApiSlide(deck: Deck, slide: Slide): Promise<void> {
-        return new Promise<void>(async (resolve, reject) => {
-            if (!deck.data.api_id || deck.data.api_id === undefined || deck.data.api_id === '') {
-                resolve();
-                return;
-            }
-
-            if (!slide.data.api_id || slide.data.api_id === undefined || slide.data.api_id === '') {
-                resolve();
-                return;
-            }
-
-            try {
-                await this.apiSlideService.delete(deck.data.api_id, slide.data.api_id);
-
-                resolve();
-            } catch (err) {
-                reject(err);
-            }
-        });
-    }
-
     private deleteSlideElement(): Promise<void> {
         return new Promise<void>(async (resolve) => {
             const deck: HTMLElement = this.el.querySelector('deckgo-deck');

studio/src/app/models/api/api.deck.tsx

@@ -1,8 +1,9 @@
 import {DeckAttributes} from '../data/deck';
+import {ApiSlide} from './api.slide';
 
 export interface ApiDeck {
     id?: string;
-    slides: string[];
+    slides: ApiSlide[];
     name: string;
     owner_id: string;
     attributes?: DeckAttributes;

studio/src/app/models/api/api.presentation.tsx

@@ -0,0 +1,4 @@
+export interface ApiPresentation {
+    id: string,
+    url: string;
+}

studio/src/app/models/api/api.slide.tsx

@@ -1,7 +1,6 @@
 import {SlideAttributes, SlideTemplate} from '../data/slide';
 
 export interface ApiSlide {
-    id?: string;
     content?: string;
     template: SlideTemplate,
     attributes?: SlideAttributes;

studio/src/app/services/api/deck/api.deck.service.tsx

@@ -0,0 +1,71 @@
+import {EnvironmentConfigService} from '../../core/environment/environment-config.service';
+
+import {ApiDeck} from '../../../models/api/api.deck';
+
+import {EnvironmentDeckDeckGoConfig} from '../../core/environment/environment-config';
+
+import {ApiPresentation} from '../../../models/api/api.presentation';
+
+import {AuthService} from '../../auth/auth.service';
+
+export class ApiPresentationService {
+
+    private static instance: ApiPresentationService;
+
+    private authService: AuthService;
+
+    private constructor() {
+        // Private constructor, singleton
+        this.authService = AuthService.getInstance();
+    }
+
+    static getInstance() {
+        if (!ApiPresentationService.instance) {
+            ApiPresentationService.instance = new ApiPresentationService();
+        }
+        return ApiPresentationService.instance;
+    }
+
+    post(deck: ApiDeck): Promise<ApiPresentation> {
+        return this.query(deck, '/presentations', 'POST');
+    }
+
+    put(apiDeckId: string, deck: ApiDeck, bearer?: string): Promise<ApiPresentation> {
+        return this.query(deck, `/presentations/${apiDeckId}`, 'PUT', bearer);
+    }
+
+    private query(deck: ApiDeck, context: string, method: string, bearer?: string): Promise<ApiPresentation> {
+        return new Promise<ApiPresentation>(async (resolve, reject) => {
+            try {
+                const config: EnvironmentDeckDeckGoConfig = EnvironmentConfigService.getInstance().get('deckdeckgo');
+
+                if (!bearer) {
+                    bearer = await this.authService.getBearer();
+                }
+
+                const rawResponse: Response = await fetch(config.apiUrl + context, {
+                    method: method,
+                    headers: {
+                        'Accept': 'application/json',
+                        'Content-Type': 'application/json',
+                        'Authorization': bearer
+                    },
+                    body: JSON.stringify(deck)
+                });
+
+                if (!rawResponse || !rawResponse.ok) {
+                    reject('Something went wrong while creating or updating the deck');
+                    return;
+                }
+
+                const publishedPresentation: ApiPresentation = await rawResponse.json();
+
+                resolve(publishedPresentation);
+            } catch (err) {
+                reject(err);
+            }
+        });
+    }
+
+}
+