implementing mysql GalleryManager

common/entities/ConentWrapper.ts

@@ -1,11 +1,11 @@
-import {Directory} from "./Directory";
+import {DirectoryDTO} from "./DirectoryDTO";
 import {SearchResult} from "./SearchResult";
 export class ContentWrapper {
 
-    public directory:Directory;
+    public directory: DirectoryDTO;
     public searchResult:SearchResult;
 
-    constructor(directory:Directory = null, searchResult:SearchResult = null) {
+    constructor(directory: DirectoryDTO = null, searchResult: SearchResult = null) {
         this.directory = directory;
         this.searchResult = searchResult;
     }

common/entities/Directory.ts

@@ -1,11 +0,0 @@
-import {Photo} from "./Photo";
-export class Directory {
-
-    constructor(public id?:number,
-                public name?:string,
-                public path?:string,
-                public lastUpdate?:Date,
-                public directories:Array<Directory> = [],
-                public photos:Array<Photo> = []) {
-    }
-}

common/entities/DirectoryDTO.ts

@@ -0,0 +1,11 @@
+import {PhotoDTO} from "./PhotoDTO";
+
+export interface DirectoryDTO {
+    id: number;
+    name: string;
+    path: string;
+    lastUpdate: Date;
+    parent: DirectoryDTO;
+    directories: Array<DirectoryDTO>;
+    photos: Array<PhotoDTO>;
+}

common/entities/Photo.ts

@@ -1,48 +0,0 @@
-import {Directory} from "./Directory";
-
-export class Photo {
-    constructor(public id?:number,
-                public name?:string,
-                public directory?:Directory,
-                public metadata?:PhotoMetadata,
-                public readyThumbnails:Array<number> = []) {
-    }
-}
-
-export class PhotoMetadata {
-    constructor(public keywords?:Array<string>,
-                public cameraData?:CameraMetadata,
-                public positionData?:PositionMetaData,
-                public size?:ImageSize,
-                public creationDate?:Date) {
-    }
-}
-
-export interface ImageSize {
-    width:number;
-    height:number;
-}
-
-export interface CameraMetadata {
-    ISO?:number;
-    model?:string;
-    maker?:string;
-    fStop?:number;
-    exposure?:number;
-    focalLength?:number;
-    lens?:string;
-}
-
-export interface PositionMetaData {
-    GPSData?:GPSMetadata;
-    country?:string;
-    state?:string;
-    city?:string;
-}
-
-export interface GPSMetadata {
-    latitude?:string;
-    longitude?:string;
-    altitude?:string;
-
-}

common/entities/PhotoDTO.ts

@@ -0,0 +1,46 @@
+import {DirectoryDTO} from "./DirectoryDTO";
+
+export interface PhotoDTO {
+    id: number;
+    name: string;
+    directory: DirectoryDTO;
+    metadata: PhotoMetadata;
+    readyThumbnails: Array<number>;
+}
+
+export interface PhotoMetadata {
+    keywords: Array<string>;
+    cameraData: CameraMetadata;
+    positionData: PositionMetaData;
+    size: ImageSize;
+    creationDate: Date;
+}
+
+export interface ImageSize {
+    width: number;
+    height: number;
+}
+
+export interface CameraMetadata {
+    ISO?: number;
+    model?: string;
+    maker?: string;
+    fStop?: number;
+    exposure?: number;
+    focalLength?: number;
+    lens?: string;
+}
+
+export interface PositionMetaData {
+    GPSData?: GPSMetadata;
+    country?: string;
+    state?: string;
+    city?: string;
+}
+
+export interface GPSMetadata {
+    latitude?: string;
+    longitude?: string;
+    altitude?: string;
+
+}

common/entities/SearchResult.ts

@@ -1,9 +1,9 @@
-import {Directory} from "./Directory";
-import {Photo} from "./Photo";
+import {DirectoryDTO} from "./DirectoryDTO";
+import {PhotoDTO} from "./PhotoDTO";
 import {SearchTypes} from "./AutoCompleteItem";
 export class SearchResult {
     public searchText:string = "";
     public searchType:SearchTypes;
-    public directories:Array<Directory> = [];
-    public photos:Array<Photo> = [];
+    public directories: Array<DirectoryDTO> = [];
+    public photos: Array<PhotoDTO> = [];
 }