Skip to content

Commit bb2435b

Browse files
author
Ian Redpath
committed
NOT STYLING. remove obselete service, trim query before sending to omdbapi
1 parent 4328c7c commit bb2435b

File tree

3 files changed

+5
-25
lines changed

3 files changed

+5
-25
lines changed

public/project/components/movies/movies.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { View, Component, Inject } from 'angular2/core'
22
import { RouterLink } from 'angular2/router'
33
import { MovieService } from '../../services/movieService'
4-
import { ResultsService } from '../../services/resultsService'
4+
import { OmdbService } from '../../services/omdbService'
55
import { PosterService } from '../../services/posterService'
66
import { OmdbMovieModel } from '../../models/omdbMovieModel'
77

@@ -30,7 +30,7 @@ export class Movies {
3030
pages: Array<number>
3131
query: string
3232

33-
constructor(public movieService: MovieService, public resultsService: ResultsService,
33+
constructor(public movieService: MovieService, public omdbService: OmdbService,
3434
public posterService: PosterService) {
3535

3636
this.fetchingMovies = true
@@ -67,7 +67,7 @@ export class Movies {
6767
}
6868

6969
search() {
70-
this.resultsService.getResults(this.query, null)
70+
this.omdbService.findMovieBySearch(this.query, null)
7171
.subscribe(
7272
resp => {
7373
const data = resp.json()
@@ -109,7 +109,7 @@ export class Movies {
109109

110110
getResultsPage(page: number) {
111111
this.fetchingResults = true
112-
this.resultsService.getResults(this.query, page)
112+
this.omdbService.findMovieBySearch(this.query, page)
113113
.subscribe(resp => {
114114
const data = resp.json()
115115
if (data.Response) {

public/project/services/omdbService.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export class OmdbService {
1818

1919
// TODO: pagination for 10+responses
2020
findMovieBySearch(query: string, page: number) {
21-
let url: string = `${this.BASE_URL}?s=${query}&r=json&tomatoes=true`
21+
let url: string = `${this.BASE_URL}?s=${query.trim()}&r=json&tomatoes=true`
2222
if (page) {
2323
url += `&page=${page}`
2424
}

public/project/services/resultsService.ts

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)