Data model #3

.gitignore

@@ -26,7 +26,8 @@ platforms/
 plugins/
 plugins/android.json
 plugins/ios.json
-www/
+www/*
+!www/mock-api
 $RECYCLE.BIN/
 
 .DS_Store

src/app/app.module.ts

@@ -12,6 +12,9 @@ import {SplashScreen} from "@ionic-native/splash-screen";
 import {StanizerService} from "../services/stanizer.service";
 import {StoryDetailsPage} from "../pages/storydetails/storydetails";
 import {PrismaService} from "../services/back-end/prisma-api.service";
+import {UserService} from "../services/back-end/user.service";
+import {HttpModule} from "@angular/http";
+import {StoryService} from "../services/back-end/story.service";
 
 @NgModule({
   declarations: [
@@ -23,7 +26,8 @@ import {PrismaService} from "../services/back-end/prisma-api.service";
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(MyApp)
+    IonicModule.forRoot(MyApp),
+    HttpModule
   ],
   bootstrap: [IonicApp],
   entryComponents: [
@@ -38,6 +42,8 @@ import {PrismaService} from "../services/back-end/prisma-api.service";
     SplashScreen,
     StanizerService,
     PrismaService,
+    StoryService,
+    UserService,
     {provide: ErrorHandler, useClass: IonicErrorHandler}
   ]
 })

src/dto/abstract-story.ts

@@ -0,0 +1,29 @@
+import { StoryType } from './enum/story-type';
+import {Category} from "./category";
+
+export abstract class AbstractStory {
+  id: string;
+  type: StoryType;
+  source: string;
+  title: string;
+  description: string;
+  dateAdded: Date;
+  dateHappened: Date;
+  likes: string[]; // userId's
+  comments: Comment[];
+  categories: Category[];
+
+
+  constructor(json?){
+    this.id = json.id;
+    this.type = json.type;
+    this.source = json.source;
+    this.title = json.title;
+    this.description = json.description;
+    this.dateAdded = json.dateAdded;
+    this.dateHappened = json.dateHappened;
+    this.likes = json.likes;
+    this.comments = json.comments;
+    this.categories = json.categories;
+  }
+}

src/dto/abstract-user.ts

@@ -0,0 +1,33 @@
+export abstract class AbstractUser {
+
+  // personal info
+  id: string;
+  firstName: string;
+  lastName: string;
+  dateOfBirth: Date;
+  birthLocation: string;
+
+  // profile picture
+  profilePicture: string;
+
+  constructor(json?) {
+    if (json) {
+      this.firstName = json.firstName;
+      this.lastName = json.lastName;
+      this.dateOfBirth = new Date(json.dateOfBirth);
+      this.birthLocation = json.birthLocation;
+      this.profilePicture = json.profilePicture;
+    }
+  }
+
+  getThumbnail(): string {
+    return this.profilePicture; // TODO: derive thumbnail link
+  }
+
+  /** Gets the age of the user */
+  getAge(): number {
+    // this can be derived from the dateOfBirth
+    return 1; // TODO: with moment.js
+  }
+
+}

src/dto/album.ts

@@ -0,0 +1,8 @@
+import { UserStory } from './user-story';
+
+export class Album {
+  id: string;
+  title: string;
+  description: string;
+  stories: UserStory[];
+}

src/dto/category.ts

@@ -0,0 +1,4 @@
+export class Category {
+  id: string;
+  name: string;
+}

src/dto/comment.ts

@@ -0,0 +1,6 @@
+export class Comment {
+  id: string;
+  storyId: string;
+  userId: string;
+  comment: string;
+}

src/dto/enum/story-type.ts

@@ -0,0 +1,6 @@
+export enum StoryType {
+  TEXT = 0,
+  AUDIO = 1,
+  IMAGE = 2,
+  VIDEO = 3,
+}

src/dto/heritage-story.ts

@@ -0,0 +1,5 @@
+import { AbstractStory } from './abstract-story';
+
+export class HeritageStory extends AbstractStory {
+  // TODO: specific heritage properties
+}

src/dto/life-event.ts

@@ -0,0 +1,8 @@
+export class LifeEvent {
+  id: string;
+  userId: string;
+  withUser: string;
+  name: string;
+  date: Date;
+  storyId: string;
+}

src/dto/patient.ts

@@ -0,0 +1,13 @@
+import { AbstractUser } from './abstract-user';
+import { WorkPlace } from './work-place';
+import { LifeEvent } from './life-event';
+import { Relation } from './relation';
+import {Category} from "./category";
+
+export class Patient extends AbstractUser {
+  careHouse: string;
+  workPlaces: WorkPlace[];
+  lifeEvents: LifeEvent[];
+  relations: Relation[];
+  interests: Category[];
+}

src/dto/relation-types.ts

@@ -0,0 +1,11 @@
+/** relation suggestions */
+export const relationTypes = {
+  "father": "father",
+  "mother": "mother",
+  "nurse": "nurse",
+  "son": "son",
+  "daughter": "daughter",
+  "grandson": "grandson",
+  "granddaughter": "granddaughter",
+  "friend": "friend"
+}

src/dto/relation.ts

@@ -0,0 +1,17 @@
+export class Relation {
+
+  id: string;
+  type: string;
+  patientId: string;
+  userId: string;
+
+  constructor(json?) {
+    if (json) {
+      this.type = json.type;
+
+     // this.id = json.id;
+    //  this.patientId = json.patientId;
+      this.userId = json.userId;
+    }
+  }
+}

src/dto/user-story.ts

@@ -0,0 +1,13 @@
+import { AbstractStory } from './abstract-story';
+
+export class UserStory extends AbstractStory {
+    albumId: string;
+    originId: string; // heritage origin story
+
+
+  constructor(json?) {
+    super(json);
+    this.albumId = json.albumId;
+    this.originId = json.originId;
+  }
+}

src/dto/user.ts

@@ -0,0 +1,25 @@
+import { AbstractUser } from './abstract-user';
+import { Relation } from './relation';
+
+export class User extends AbstractUser {
+
+  email: string;
+  password: string;
+  relations: Relation[];
+
+  constructor(json?) {
+    super(json);
+    if (json) {
+      this.email = json.email;
+      this.password = json.password;
+      this.relations = [];
+      json.relations.forEach(relation => {
+        relation.id = relation.id ? relation.id : this.id;
+          console.log("1");
+        this.relations.push(new Relation(relation));
+          }
+        );
+    }
+  }
+
+}

src/dto/work-place.ts

@@ -0,0 +1,5 @@
+export class WorkPlace {
+  function: string;
+  location: string;
+  period: Date;
+}

src/pages/stories/stories.html

@@ -1,7 +1,7 @@
 <ion-header>
   <ion-navbar>
     <ion-title>
-      Mijn verhalen
+      Mijn verhalen - TEST: <div *ngIf="user"> {{user.firstName}}</div>
     </ion-title>
   </ion-navbar>
 </ion-header>

src/pages/stories/stories.ts

@@ -1,7 +1,9 @@
-import { Component } from '@angular/core';
+import {Component, OnInit} from '@angular/core';
 import { NavController } from 'ionic-angular';
 import { StanizerService } from '../../services/stanizer.service';
 import {StoryDetailsPage} from "../storydetails/storydetails";
+import {UserService} from "../../services/back-end/user.service";
+import {User} from "../../dto/user";
 
 /**
  * More info on the slides management : https://ionicframework.com/docs/api/components/slides/Slides/
@@ -10,7 +12,7 @@ import {StoryDetailsPage} from "../storydetails/storydetails";
   selector: 'page-stories',
   templateUrl: 'stories.html'
 })
-export class StoriesPage {
+export class StoriesPage implements OnInit {
 
   public youtubeUrl:string = "www.youtube.com/embed/ERD4CbBDNI0?rel=0&showinfo=0";
   public stanizedYoutubeUrl:any;
@@ -45,10 +47,21 @@ export class StoriesPage {
     {name:"Relevant vandaag",data:this.album4Data},
     ];
 
-  constructor(public navCtrl: NavController,private stanizerService: StanizerService) {
+  user: User;
+
+  constructor(public navCtrl: NavController, private stanizerService: StanizerService,
+              private userService: UserService) {
       this.stanizedYoutubeUrl = this.stanizerService.sanitize(this.youtubeUrl);
   }
 
+  ngOnInit(): void {
+    this.userService.getUser("12345").toPromise().then(user => {
+
+        this.user = user
+        console.log("Final user : " + JSON.stringify(this.user));
+      });
+  }
+
 
   showDetails(dataAlbum:Array<any>,dataIndex:number) {
     this.navCtrl.push(StoryDetailsPage, {

src/services/back-end/prisma-api.service.ts

@@ -1,7 +1,8 @@
 import {Injectable, OnInit} from "@angular/core";
+import {Http } from "@angular/http";
+import {Observable} from "rxjs/Observable";
+import 'rxjs/add/observable/of';
 import {API_URL, env} from "../../app/environment";
-import {Http, RequestOptions} from "@angular/http";
-import {NavController} from "ionic-angular";
 /**
  * Created by Jean on 10-07-17.
  *
@@ -12,8 +13,10 @@ import {NavController} from "ionic-angular";
 export class PrismaService implements OnInit {
   protected _urlToApi: string = API_URL;
   protected _head: Headers = new Headers({'Content-Type': 'application/json; charset=UTF-8'});
+  _http: Http;
 
-  constructor(protected _http: Http, public navCtrl: NavController) {
+  constructor(_httpSer: Http) {
+    this._http = _httpSer;
     // this._head.set('Accept', 'application/json,application/pdf,application/plain; charset=UTF-8');
     // Domain you wish to allow
     this._head.set('Access-Control-Allow-Origin', API_URL);
@@ -35,4 +38,8 @@ export class PrismaService implements OnInit {
     this._head.delete('Authorization');
   }
 
+  public handleError(error: Response | any) {
+    console.log("Error ! " + JSON.stringify(error));
+    return Observable.of(error) as Observable<any>;
+  }
 }

src/services/back-end/story.service.ts

@@ -0,0 +1,27 @@
+import { PrismaService } from "./prisma-api.service";
+import { Observable } from "rxjs/Observable";
+import { User } from "../../dto/user";
+import 'rxjs/add/operator/catch';
+import 'rxjs/add/operator/map';
+import 'rxjs/Rx';
+import {Subscription} from 'rxjs/Subscription';
+import { Injectable } from "@angular/core";
+import {UserStory} from "../../dto/user-story";
+
+@Injectable()
+export class StoryService extends PrismaService {
+
+
+  getUserStories(userId: string): Observable<UserStory[]> {
+    return this._http.get("/mock-api/stories.json").map(res => {
+      console.log("look here  2" + JSON.stringify(res.json()));
+        let userStories:UserStory[] = [];
+        res.json().forEach(story =>
+      {
+        userStories.push(new UserStory(story));
+      })
+        return userStories;
+      })
+      .catch(error => this.handleError(error));
+  }
+}

src/services/back-end/user.service.ts

@@ -0,0 +1,21 @@
+import { PrismaService } from "./prisma-api.service";
+import { Observable } from "rxjs/Observable";
+import { User } from "../../dto/user";
+import 'rxjs/add/operator/catch';
+import 'rxjs/add/operator/map';
+import 'rxjs/Rx';
+import {Subscription} from 'rxjs/Subscription';
+import { Injectable } from "@angular/core";
+
+@Injectable()
+export class UserService extends PrismaService {
+
+
+  getUser(id: string): Observable<User> {
+    return this._http.get("/mock-api/users_id.json").map(res => {
+      console.log("look here " + JSON.stringify(res.json()));
+        return new User(res.json());
+      })
+      .catch(error => this.handleError(error));
+  }
+}