llamado al servicio trace track

UAMISO4101 · Nov 1, 2016 · 63caeb2 · 63caeb2
1 parent dc64a82
commit 63caeb2
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 6 deletions.
diff --git a/tracks/urls.py b/tracks/urls.py
@@ -2,9 +2,9 @@
 from .views import TrackListView,TrackCreateView,register_rate_track,  trace, Top10
 
 urlpatterns = [
-    url(r'^', TrackListView.as_view(), name='track-list'),
+    url(r'^$', TrackListView.as_view(), name='track-list'),
     url(r'^rate_track/$', register_rate_track, name='rate_track'),
     url(r'^create/$', TrackCreateView.as_view(), name='track-create'),
-    url(r'^trace/', trace),
-    url(r'^top10/', Top10.as_view(), name='top10'),
+    url(r'^trace/$', trace, name="trace"),
+    url(r'^top10/$', Top10.as_view(), name='top10'),
 ]
diff --git a/web/webcontent/app/main/mainService.js b/web/webcontent/app/main/mainService.js
@@ -31,6 +31,10 @@ mainModule.factory('mainService', ['$i18n', '$freevenModal', 'notifierService',
                 self.user = userData;
                 self.saveUserCookies(userData);
             };
+
+            self.getUserData = function () {
+                return self.user;
+            };
             self.loadUserDataFromCookies = function () {
                 self.user = $cookieStore.get('user_data') || {};
             };

diff --git a/web/webcontent/app/player/playerService.js b/web/webcontent/app/player/playerService.js
@@ -1,6 +1,6 @@
 var playerModule = angular.module('playerModule');
-playerModule.factory('playerService', ['ngAudio',
-    function (ngAudio) {
+playerModule.factory('playerService', ['ngAudio', 'TracksApiService', 'mainService',
+    function (ngAudio, TracksApiService, mainService) {
         var PlayerService = function () {
             var self = this;
             self.audio = null;
@@ -19,10 +19,28 @@ playerModule.factory('playerService', ['ngAudio',
                 self.audio = ngAudio.load(track.url);
                 self.audio.play();
                 self.track = track;
+                self.traceTrack(track);
             };
             self.showPlayer = function () {
                 return self.audio != null
             };
+
+            self.traceTrack = function (track) {
+                var user = mainService.getUserData();
+                TracksApiService.traceTrack(
+                    {
+                        user: user.username,
+                        track: track.name,
+                        artist: track.artist_id,
+                        action: 'play'
+                    },
+                    function (response) {
+
+                    },
+                    function (error) {
+                        console.log('Error loading tracks');
+                    });
+            };
         };
         return new PlayerService();
     }]);
diff --git a/web/webcontent/app/restAPI/tracksAPIService.js b/web/webcontent/app/restAPI/tracksAPIService.js
@@ -13,7 +13,7 @@ restApiModule.factory('TracksApiService', ['$resource', function ($resource) {
 
         },
         loadTopTracks: {
-            url: 'api/track',
+            url: 'api/track/top10',
             /* url: 'api/track/top',*/
             method: 'GET',
             params: {},
@@ -26,6 +26,17 @@ restApiModule.factory('TracksApiService', ['$resource', function ($resource) {
                 value: '@string'
             },
             isArray: false
+        },
+        traceTrack: {
+            url: 'api/track/trace',
+            method: 'POST',
+            params: {
+                user: '@string',
+                track: '@string',
+                artist: '@string',
+                action: '@string'
+            },
+            isArray: false
         }
     });
 }]);