various bug fixes

Author: Ian Redpath

public/project/components/libraries/library.ts

@@ -64,7 +64,6 @@ export class Library {
 					this.library = resp.json().library
 				}
 			})
-		//_.remove(this.library.movies, mov => { return mov.imdbId === id })
 	}
 
 }

public/project/components/movies/movie.ts

@@ -30,19 +30,30 @@ export class Movie {
 		this.fetchingMovie = true
 		this.fetchingLibraries = true
 		const imdbId: string = params.get('movie')
-		movieService.get(imdbId)
+		/*movieService.get(imdbId)
 			.subscribe(
 				resp => { 
 					if (resp.json().movie) {
 						this.movie = resp.json().movie
-					}
+					} 
 					this.fetchingLibraries = false
-				})
+				})*/
 		omdbService.findMovieById(imdbId)
 			.subscribe(
-				data => { this.omdbMovie = OmdbMovieModel.newMovie(data.json()) },
+				data => { 
+					this.omdbMovie = OmdbMovieModel.newMovie(data.json())
+					movieService.getOrCreate(imdbId, this.omdbMovie.title)
+						.subscribe(resp => {
+							if (resp.json().movie) {
+								this.movie = resp.json().movie
+							} else {
+								console.log('error fetching movie')
+							}
+							this.fetchingLibraries = false
+						})
+				},
 				err => { alert(err); this.omdbMovie = OmdbMovieModel.emptyMovie() },
-				() => { this.fetchingMovie = false}
+				() => { this.fetchingMovie = false }
 			)
 	}
 	// eventually, this will be part of a new component and logic will be moved out of here
@@ -57,12 +68,6 @@ export class Movie {
 		} else {
 			alert("please select a library first")
 		}
-		/*
-		if(this.userService.getActiveUser()) {
-			const movieToAdd: MovieModel = this.movieService.transformFromOmdb(this.movie)
-			this.userService.addMovie(movieToAdd)
-		} else {
-			alert('sign in to add a movie!')
-		}*/
+
 	}
 }

public/project/components/users/user.view.html

@@ -6,10 +6,6 @@
     </div>
     <div class="col-sm-6 col-md-5">
       <h1>{{user.username}}</h1>
-      <div class="follow-links">
-        <a href="">Following</a>
-        <a href="">Followers</a>
-      </div>
     </div>
     <div class="col-sm-2 col-md-4"></div>
   </div>

public/project/services/movieService.ts

@@ -11,45 +11,20 @@ export class MovieService {
 	constructor(public http: Http) {
 		this.headers = new Headers()
 		this.headers.append("Content-Type", "application/json")
-		/*const sampleData = [
-			{ id: 1, imdbId: "tt0120338", title: "Titanic" },
-			{ id: 2, imdbId: "tt0096895", title: "Batman" },
-			{ id: 3, imdbId: "tt1431045", title: "Deadpool" }
-		]
-		_.forEach(sampleData, mov => {
-			let model: MovieModel = MovieModel.newMovie(mov)
-			this.addMovie(model)
-		})*/
 	}
 
 	get(id: string) {
 		return this.http.get(`/api/project/movie/${id}`,
 			{ headers: this.headers })
-		//return this.movies[id]
 	}
 	getAll() {
 		return this.http.get('/api/project/movie',
 			{ headers: this.headers })
-		//return <Array<MovieModel>> _.values(this.movies)
 	}
 	addMovie(movie: MovieModel) {
 		return this.http.post('/api/project/movie', JSON.stringify({ movie }),
 			{ headers: this.headers })
-		//this.movies[movie.imdbId] = movie
 	}
-	/*
-	transformFromOmdb(movie: OmdbMovieModel) {
-		// if it exists, return it 
-		const exists: MovieModel = _.find(this.getAll(), mov => { return mov.imdbId === movie.imdbId })
-		if(exists) {
-			return exists
-		} else {
-			// add it, then return
-			const newMovie: MovieModel = MovieModel.newMovie(movie)
-			this.addMovie(newMovie)
-			return newMovie
-		}
-	}*/
 
 	getMoviesForUser(id: string) {
 		return this.http.get(`/api/project/movie?user=${id}`,
@@ -61,4 +36,8 @@ export class MovieService {
 			{ headers: this.headers })
 	}
 
+	getOrCreate(imdbid: string, title: string) {
+		return this.http.get(`/api/project/movie?id=${imdbid}&title=${title}`, { headers: this.headers })
+	}
+
 }

public/project/services/userService.ts

@@ -10,82 +10,27 @@ import { MovieService } from '../services/movieService'
 @Injectable()
 export class UserService {
 
-	users: Object
 	activeUser: UserModel
 	headers
 
 	constructor(public libraryService: LibraryService, public movieService: MovieService, public http: Http) {
 		this.headers = new Headers()
 		this.headers.append("Content-Type", "application/json")
-		/*this.users = {}
-		this.activeUser = null
-		const userData = [
-			{ "_id": 123, "firstname": "Alice", "lastname": "Wonderland", "username": "alice", "password": "alice",
-				libraries: [{
-					id: 1, name: "sample1", movies: [{ id: 1, imdbId: "tt0120338", title: "Titanic" }],
-					comments: [], ratings: [], user: { username: "alice", id: 123 }
-				},
-			{
-				id: 2, name: "sample2", movies: [
-					{ id: 2, imdbId: "tt0096895", title: "Batman" },
-					{ id: 3, imdbId: "tt1431045", title: "Deadpool" }],
-				comments: [], ratings: [], user: { username: "alice", id: 123 }
-			}] },
-			{ "_id": 234, "firstname": "Bob", "lastname": "Hope", "username": "bob", "password": "bob",
-				libraries: [{
-					id: 3, name: "sample3", movies: [
-						{ id: 1, imdbId: "tt0120338", title: "Titanic" },
-						{ id: 3, imdbId: "tt1431045", title: "Deadpool" }],
-					comments: [], ratings: [], user: { username: "bob", id: 234 }
-				}]
-			},
-			{ "_id": 345, "firstname": "Charlie", "lastname": "Brown", "username": "charlie", "password": "charlie" },
-			{ "_id": 456, "firstname": "Dan", "lastname": "Craig", "username": "dan", "password": "dan" },
-			{ "_id": 567, "firstname": "Edward", "lastname": "Norton", "username": "ed", "password": "ed"}
-		]
-		// Create users based on userData
-		_.forEach(userData, (data) => {
-			let user: UserModel = UserModel.newUser(data)
-			this.users[user.id] = user
-		})*/
 	}
 
 	findUserByCredentials(username: string, password: string) {//, callback: Function) {
 		return this.http.get(`/api/project/user?username=${username}&password=${password}`,
 			{ headers: this.headers })
-		/*let user: UserModel
-		for (user of <Array<UserModel>> _.values(this.users)) {
-			if (user.username === username && user.password === password) {
-				callback(user)
-				return
-			}
-		}
-		callback(null)*/
 	}
 
 	findAllUsers(callback) {
 		return this.http.get('/api/project/user',
 			{ headers: this.headers })
-		//callback(_.values(this.users))
 	}
 
 	createUser(user) {
 		return this.http.post('/api/project/user', JSON.stringify({ user }),
 			{ headers: this.headers })
-		/*user.id = (new Date).getTime()
-		// ensure unique username
-		if (user.username && !this.duplicateUsername(user.username)) {
-			this.users[user.id] = user
-			callback(user)
-		} else {
-			callback(null)
-		}*/
-	}
-
-	duplicateUsername(name) {
-		return _.some(<Array<UserModel>> _.values(this.users), user => {
-			return user.username === name
-		})
 	}
 
 	login(user: UserModel) {
@@ -100,25 +45,10 @@ export class UserService {
 	getUserById(id: number) {
 		return this.http.get(`/api/project/user/${id}`,
 			{ headers: this.headers })
-			//this.users[id]
 	}
 
 	removeLibrary(libId, userId) {
 		return this.http.delete(`/api/project/user/${userId}/library/${libId}`, { headers: this.headers })
 	}
 
-	addMovie(movie: MovieModel) {
-		if(this.activeUser.libraries.length > 0) {
-			this.activeUser.libraries[0].movies.push(movie)
-			this.addLibrary(this.activeUser.libraries[0])
-		}
-	}
-
-	addLibrary(library: LibraryModel) {
-		if (this.activeUser) {
-			this.users[this.activeUser._id].libraries.push(library)
-			this.libraryService.addLibrary(library)
-		}
-	}
-
 }

server/project/data/database.ts

@@ -180,4 +180,17 @@ export default class Database {
 		_.remove(movie.libraries, lib => { return (<any>lib).id.toString() === libraryId })
 		return library
 	}
+
+	getMovie(id: string, title: string) {
+		let movie = _.find(this.movies, mov => { return mov.imdbId === id })
+		if (movie) {
+			return movie
+		} else {
+			movie = {}
+			movie.libraries = []
+			movie.imdbId = id
+			movie.title = title
+			return this.createMovie(movie)
+		}
+	}
 }

server/project/endpoints/movieEndpoints.ts

@@ -1,8 +1,14 @@
 export default function(app, db) {
 
 	app.get('/api/project/movie', (req, res) => {
-		const movies = db.getAllMovies()
-		res.status(200).send({ movies })
+		const query = req.query
+		if (query.id && query.title) {
+			const movie = db.getMovie(query.id, query.title)
+			res.status(200).send({ movie })
+		} else {
+			const movies = db.getAllMovies()
+			res.status(200).send({ movies })
+		}
 	})
 
 	app.get('/api/project/movie/:id', (req, res) => {