api get response ok & implement get products request

Author: Pierre-Florent Poujol

functions/src/index.ts

@@ -22,17 +22,20 @@ const promoCollection = 'promotions';
 //define google cloud function name
 export const webServices = functions.region('europe-west1').https.onRequest(main);
 
-// https://europe-west1-mspr-gostyleapp.cloudfunctions.net/webServices/api/promotions/Extra10
+
 app.get('/promotions/:promoId', (req, res) => {
 
     const promoId = req.params.promoId;
     db.collection(promoCollection).doc(promoId).get()
         .then(promo => {
             if (!promo.exists) {
-                res.status(400).json({error: 'Promotion introuvable.'});
+                res.status(400).json({
+                    status : 'error',
+                    message: 'Promotion introuvable.'
+                });
             } else {
                 res.status(200).json({
-                    id: promo.id,
+                    status : "success",
                     data: {
                         code: promo.data()?.code,
                         dateExpiration: promo.data()?.dateExpiration.toDate(),
@@ -63,7 +66,6 @@ app.post('/promotions',  (req, res) => {
                 description: body.description
             };
             db.collection(promoCollection).doc(promo.code).get().then(doc => {
-                console.log(doc)
                 if (doc.exists) {
                     res.status(400).send('Cette promotion existe déjà.');
                 } else {
@@ -76,29 +78,31 @@ app.post('/promotions',  (req, res) => {
 
         }
     } catch (error) {
-        console.log('error');
         res.status(400).send('La promotion doit contenir les valeurs suivantes : "code", "dateExpiration", "description"');
     }
 });
 
 app.delete('/promotions/:promoId', async (req, res) => {
     await db.collection(promoCollection).doc(req.params.promoId).delete();
-    res.status(200).send('La promotion a bien été supprimée !');
+    res.status(204).send({});
 });
 
 app.get('/users/:userId', (req, res) => {
     const userId = req.params.userId;
     db.collection(userCollection).doc(userId).get()
         .then(user => {
             if (!user.exists) {
-                res.status(400).json({error: 'Utilisateur introuvable.'});
+                res.status(400).json({
+                    status : 'error',
+                    message: 'Utilisateur introuvable.'
+                });
             }
             res.status(200).json({
-                id: user.id,
+                status : "success",
                 data: {
                     uid: user.id,
                     name: user.data()?.name,
-                    firstname: user.data()?.firstname,
+                    firstname: user.data()?.firstname
                 }
             });
         }).catch(error => res.status(500).send(error));
@@ -109,24 +113,27 @@ app.get('/users/:userId/promotions', (req, res) => {
     db.collection(userCollection).doc(userId).get()
         .then(user => {
             if (!user.exists) {
-                res.status(400).json({error: 'Utilisateur introuvable.'});
+                res.status(400).json({
+                    status : 'error',
+                    message: 'Utilisateur introuvable.'
+                });
             }
             const promises = Object.keys(user.data()?.ownedPromos).map(promoId => db.collection(promoCollection).doc(promoId).get());
             Promise.all(promises).then(promosSnapshot => {
                 const promotions: any[] = [];
                 promosSnapshot.forEach(promo => {
                     if (promo.exists) {
                         promotions.push({
-                            id: promo.id,
-                            data: {
-                                code: promo.data()?.code,
-                                dateExpiration: promo.data()?.dateExpiration.toDate(),
-                                description: promo.data()?.description
-                            }
+                            code: promo.data()?.code,
+                            dateExpiration: promo.data()?.dateExpiration.toDate(),
+                            description: promo.data()?.description
                         });
                     }
                 });
-                res.status(200).json(promotions);
+                res.status(200).json({
+                    status : "success",
+                    data: promotions
+                });
             }).catch(error => res.status(500).send(error));
         }).catch(error => res.status(500).send(error));
 });

src/app/app.module.ts

@@ -7,11 +7,12 @@ import { StatusBar } from '@ionic-native/status-bar/ngx';
 
 import { AppComponent } from './app.component';
 import { AppRoutingModule } from './app-routing.module';
+import {HttpClientModule} from '@angular/common/http';
 
 @NgModule({
   declarations: [AppComponent],
   entryComponents: [],
-  imports: [BrowserModule, IonicModule.forRoot(), AppRoutingModule],
+  imports: [BrowserModule, HttpClientModule, IonicModule.forRoot(), AppRoutingModule],
   providers: [
     StatusBar,
     SplashScreen,

src/app/home/home.page.ts

@@ -46,56 +46,43 @@ export class HomePage implements OnInit, OnDestroy {
         this.authService.getPromisedUser().then(user => {
             this.userId = user.uid;
             return user;
-        }).then(user => this.getPromos(user.uid));
+        }).then(user => {
+            this.initUserPromos(user.uid);
+        });
     }
 
     /**
-     * Obtention de la liste des promotions de l'utilisateur ordonnée par date d'expiration
+     * Affichage message de bienvenue, et optention des promos si infos utilisateur completés.
      */
-    getPromos(uid: string) {
+    initUserPromos(uid: string) {
         this.subscriptions = this.afs.doc<UserFirestore>('users/' + uid).valueChanges().subscribe(action => {
             if (this.itInit && action !== undefined) {
                 this.presentToast(`<ion-icon name="happy"></ion-icon>   Bienvenue ${action.firstname} ${action.name} !`);
             }
             if (action !== undefined) {
                 this.itInit = false;
                 this.mapPromos = action.ownedPromos;
-                const arrPromos = Object.keys(action.ownedPromos);
-                if (arrPromos.length > 0) {
-                    const subscription = this.promosService.getPromos(arrPromos).pipe(
-                        map(actions => actions.map(a => {
-                            return {
-                                code: a.payload.doc.id,
-                                dateExpiration: a.payload.doc.data().dateExpiration.toDate(),
-                                description: a.payload.doc.data().description
-                            };
-                        }))
-                    ).subscribe(promos => {
-                        this.promos = promos;
-                    });
-                    this.subscriptions.add(subscription);
-                } else {
-                    this.msgArrIsEmpty = 'Vous ne possédez aucune promotion.';
-                    this.promos = [];
-                }
+                const subscription = this.promosService.getPromosAPI(uid).subscribe(response => {
+                    if (response.status === 'success') {
+                        this.promos = response.data.sort((a, b) => a.dateExpiration.getTime() - b.dateExpiration.getTime());
+                        if (response.data.length === 0) {
+                            this.msgArrIsEmpty = 'Vous ne possédez aucune promotion en cours.';
+                        }
+                    } else if (response.status === 'error') {
+                        this.presentAlert(response.message);
+                    }
+                });
+                this.subscriptions.add(subscription);
             } else {
                 this.msgArrIsEmpty = 'Vous devez compléter votre compte.';
                 this.presentAlertPrompt(this.userId);
             }
-
         });
     }
 
     /**
      * Obtention des infos de l'utilisateur depuis Firebase Authentification + Cloud FireStore
      */
-    checkAccount() {
-        this.afs.doc('users/' + this.userId).ref.get().then((snapshot: DocumentSnapshot<UserFirestore>) => {
-            if ( !snapshot.exists ) {
-                this.presentAlertPrompt(this.userId);
-            }
-        });
-    }
 
     scanCode() {
         this.barcodeScanner

src/app/services/promos.service.ts

@@ -1,31 +1,40 @@
 import {Injectable} from '@angular/core';
 import {AngularFirestore, DocumentChangeAction, DocumentReference} from '@angular/fire/firestore';
 import {Observable} from 'rxjs';
+
+import {HttpClient} from '@angular/common/http';
 import {PromotionFirestore} from '../models/firestore/PromotionFirestore';
+import {Promotion} from '../models/Promotion';
 
 @Injectable({
     providedIn: 'root'
 })
+export interface ResponseSuccess {
+    status: 'success';
+    data: Array<Promotion>;
+}
+export interface ResponseError {
+    status: 'error';
+    message: string;
+}
 export class PromosService {
 
-    constructor(private firestore: AngularFirestore) {
+    constructor(private http: HttpClient, private firestore: AngularFirestore) {
     }
 
-    getPromo(codePromo: string): DocumentReference {
+    getPromoAFS(codePromo: string): DocumentReference {
         return this.firestore.collection('promotions').doc(codePromo).ref;
     }
 
-    /**
-     * TODO: Ordonner par user range
-     */
-    getPromos(array: Array<string>): Observable<DocumentChangeAction<PromotionFirestore>[]> {
+    getPromosAFS(array: Array<string>): Observable<DocumentChangeAction<PromotionFirestore>[]> {
         return this.firestore.collection<PromotionFirestore>('promotions', ref => ref
-                .where('dateExpiration', '>', new Date())
-                .where('code', 'in', array))
-                .snapshotChanges();
+            .where('dateExpiration', '>', new Date())
+            .where('code', 'in', array))
+            .snapshotChanges();
     }
 
-    /*  getUser(): DocumentReference {
-        return this.firestore.collection('users').doc('goEdwr6nOpN0oyiAGWvs9vFWaSj1').ref;
-      }*/
+    getPromosAPI(uid: string): Observable<ResponseSuccess | ResponseError> {
+        const url = 'https://europe-west1-mspr-gostyleapp.cloudfunctions.net/webServices/v1/users/' + uid + '/promotions';
+        return this.http.get<ResponseSuccess | ResponseError>(url);
+    }
 }