Refactor profile and article services

Victor Costa
1 parent c6d22d1a
Showing 9 changed files with 62 additions and 37 deletions Show diff stats
src/app/cms/cms.component.ts
src/app/components/noosfero-articles/blog/blog.component.ts
src/app/components/noosfero/noosfero.service.js
src/app/content-viewer/content-viewer.component.ts
src/app/profile-info/profile-info.component.ts
src/app/profile/profile-home.component.ts
src/app/profile/profile.component.ts
src/lib/ng-noosfero-api/http/article.service.ts
src/lib/ng-noosfero-api/http/profile.service.ts
 import {StateConfig, Component, Inject} from 'ng-forward';
 import {Profile} from "./../models/interfaces";
+import {ArticleService} from "../../lib/ng-noosfero-api/http/article.service";
+
 @Component({
     selector: 'cms',
     templateUrl: "app/cms/cms.html"
 })
-@Inject("noosfero", "$stateParams", "$httpParamSerializer", "$state", "SweetAlert")
+@Inject(ArticleService, "noosfero", "$stateParams", "$httpParamSerializer", "$state", "SweetAlert")
 export class Cms {
     article: any = {};
     profile: any;
-    constructor(private noosfero: any/* TODO convert noosferoService */, private $stateParams: ng.ui.IStateParamsService, private $httpParamSerializer: any, private $state: ng.ui.IStateService, private SweetAlert: any) {
+    constructor(private ArticleService: ArticleService, private noosfero: any/* TODO convert noosferoService */, private $stateParams: ng.ui.IStateParamsService, private $httpParamSerializer: any, private $state: ng.ui.IStateService, private SweetAlert: any) {
     }
     save() {
         this.noosfero.currentProfile.then((profile: Profile) => {
-            return this.noosfero.profiles.one(profile.id).customPOST(
-                { article: this.article },
-                'articles',
-                {},
-                { 'Content-Type': 'application/json' }
-            )
+            return this.ArticleService.create(profile.id, this.article);
         }).then((response: restangular.IResponse) => {
             this.$state.transitionTo('main.profile.page', { page: response.data.article.path, profile: response.data.article.profile.identifier });
             this.SweetAlert.swal({
 import {Component, Input, Inject} from "ng-forward";
 import {Article, Profile} from "./../../../models/interfaces";
+import {ArticleService} from "../../../../lib/ng-noosfero-api/http/article.service";
 @Component({
     selector: "noosfero-blog",
     templateUrl: "app/components/noosfero-articles/blog/blog.html"
 })
-@Inject("noosfero", "$scope")
+@Inject(ArticleService, "$scope")
 export class NoosferoArticleBlog {
     @Input() article: Article;
@@ -17,7 +18,7 @@ export class NoosferoArticleBlog {
     private currentPage: number;
     private totalPosts: number = 0;
-    constructor(private noosfero: any, private $scope: ng.IScope) {
+    constructor(private ArticleService: ArticleService, private $scope: ng.IScope) {
     }
     ngOnInit() {
@@ -25,7 +26,7 @@ export class NoosferoArticleBlog {
     }
     loadPage() {
-        this.noosfero.articles.one(this.article.id).customGET("children", {
+        this.ArticleService.getChildren(this.article.id, {
             content_type: "TinyMceArticle",
             per_page: this.perPage,
             page: this.currentPage
@@ -6,18 +6,7 @@
     return {
       currentProfile: currentProfile.promise,
-      setCurrentProfile: function(profile) { currentProfile.resolve(profile) },
-      profiles: Restangular.service('profiles'),
-      articles: Restangular.service('articles'),
-      profile: function(profileId) {
-        return Restangular.one('profiles', profileId);
-      },
-      members: function(profile) {
-        return Restangular.service('members', profile);
-      },
-      boxes: function(profileId) {
-        return Restangular.service('boxes', Restangular.one('profiles', profileId))
-      }
+      setCurrentProfile: function(profile) { currentProfile.resolve(profile) }
     }
   });
 })();
@@ -5,13 +5,14 @@ import {ArticleView} from &quot;../components/noosfero-articles/article/article_view&quot;
 import {Input, Component, StateConfig, Inject} from "ng-forward";
 import {NoosferoArticleBlog} from "./../components/noosfero-articles/blog/blog.component";
+import {ArticleService} from "../../lib/ng-noosfero-api/http/article.service";
 @Component({
     selector: "content-viewer",
     templateUrl: "app/content-viewer/page.html",
     directives: [NoosferoArticleBlog, ArticleView]
 })
-@Inject("noosfero", "$log", "$stateParams")
+@Inject(ArticleService, "noosfero", "$log", "$stateParams")
 export class ContentViewer {
     @Input()
@@ -20,14 +21,14 @@ export class ContentViewer {
     @Input()
     profile: noosfero.Profile = null;
-    constructor(private noosfero: any, private $log: ng.ILogService, private $stateParams: angular.ui.IStateParamsService) {
+    constructor(private ArticleService: ArticleService, private noosfero: any, private $log: ng.ILogService, private $stateParams: angular.ui.IStateParamsService) {
         this.activate();
     }
     activate() {
         this.noosfero.currentProfile.then((profile: noosfero.Profile) => {
             this.profile = profile;
-            return this.noosfero.profiles.one(this.profile.id).one("articles").get({ path: this.$stateParams["page"] });
+            return this.ArticleService.getByProfile(this.profile.id, { path: this.$stateParams["page"] });
         }).then((response: restangular.IResponse) => {
             this.article = response.data.article;
         });
 import {StateConfig, Component, Inject} from 'ng-forward';
 import {Profile} from "./../models/interfaces";
+import {ProfileService} from "../../lib/ng-noosfero-api/http/profile.service";
 @Component({
     selector: 'profile',
     templateUrl: "app/profile-info/profile-info.html"
 })
-@Inject("noosfero")
+@Inject(ProfileService, "noosfero")
 export class ProfileInfo {
     activities: any
     profile: any
-    constructor(private noosfero: any) {
+    constructor(private ProfileService: ProfileService, private noosfero: any) {
         this.activate();
     }
     activate() {
         this.noosfero.currentProfile.then((profile: Profile) => {
             this.profile = profile;
-            return this.noosfero.profiles.one(this.profile.id).one('activities').get();
+            return this.ProfileService.getActivities(this.profile.id);
         }).then((response: restangular.IResponse) => {
             this.activities = response.data.activities;
         });
 import {StateConfig, Component, Inject} from 'ng-forward';
 import {Profile} from "./../models/interfaces";
+import {ProfileService} from "../../lib/ng-noosfero-api/http/profile.service";
 @Component({
     selector: 'profile-home',
     template: "<div></div>"
 })
-@Inject("noosfero", "$log", "$stateParams", "$scope", "$state")
+@Inject(ProfileService, "noosfero", "$log", "$stateParams", "$scope", "$state")
 export class ProfileHome {
     profile: Profile;
-    constructor(noosfero: any, $log: ng.ILogService, $stateParams: ng.ui.IStateParamsService, $scope: ng.IScope, $state: ng.ui.IStateService) {
+    constructor(ProfileService: ProfileService, noosfero: any, $log: ng.ILogService, $stateParams: ng.ui.IStateParamsService, $scope: ng.IScope, $state: ng.ui.IStateService) {
         noosfero.currentProfile.then((profile: Profile) => {
             this.profile = profile;
-            return noosfero.profile(this.profile.id).customGET('home_page', { fields: 'path' });
+            return ProfileService.get(this.profile.id).customGET('home_page', { fields: 'path' });
         }).then((response: restangular.IResponse) => {
             if (response.data.article) {
                 $state.transitionTo('main.profile.page', { page: response.data.article.path, profile: this.profile.identifier }, { location: false });
@@ -4,6 +4,7 @@ import {ProfileHome} from &#39;../profile/profile-home.component&#39;;
 import {Cms} from '../cms/cms.component';
 import {ContentViewer} from "../content-viewer/content-viewer.component";
 import {NoosferoActivities} from "../components/noosfero-activities/activities.component";
+import {ProfileService} from "../../lib/ng-noosfero-api/http/profile.service";
 import * as noosferoModels from "./../models/interfaces";
@@ -66,17 +67,17 @@ import * as noosferoModels from &quot;./../models/interfaces&quot;;
         }
     }
 ])
-@Inject("noosfero", "$log", "$stateParams")
+@Inject(ProfileService, "noosfero", "$log", "$stateParams")
 export class Profile {
     boxes: noosferoModels.Box[];
     profile: noosferoModels.Profile;
-    constructor(noosfero: any, $log: ng.ILogService, $stateParams: ng.ui.IStateParamsService) {
-        noosfero.profiles.one().get({ identifier: $stateParams["profile"] }).then((response: restangular.IResponse) => {
+    constructor(ProfileService: ProfileService, noosfero: any, $log: ng.ILogService, $stateParams: ng.ui.IStateParamsService) {
+        ProfileService.getByIdentifier($stateParams["profile"]).then((response: restangular.IResponse) => {
             this.profile = response.data[0];
             noosfero.setCurrentProfile(this.profile);
-            return noosfero.boxes(this.profile.id).one().get();
+            return ProfileService.getBoxes(this.profile.id);
         }).then((response: restangular.IResponse) => {
             this.boxes = response.data.boxes;
         });
 import { Injectable, Inject } from "ng-forward";
+import {Article} from "../../../app/models/interfaces";
 @Injectable()
 @Inject("Restangular")
@@ -8,8 +9,25 @@ export class ArticleService {
     }
+    create(profileId: number, article: Article) {
+        return this.Restangular.one('profiles', profileId).customPOST(
+            { article: article },
+            'articles',
+            {},
+            { 'Content-Type': 'application/json' }
+        );
+    }
+
+    get(articleId: number) {
+        return this.Restangular.one('articles', articleId);
+    }
+
     getByProfile(profileId: number, filters: any) {
         return this.Restangular.one('profiles', profileId).customGET('articles', filters);
     }
+    getChildren(articleId: number, options: any = {}) {
+        return this.get(articleId).customGET('children', options);
+    }
+
 }
@@ -8,8 +8,24 @@ export class ProfileService {
     }
+    getActivities(profileId: number, options: any = {}) {
+        return this.get(profileId).customGET("activities", options);
+    }
+
+    get(profileId: number) {
+        return this.Restangular.one('profiles', profileId);
+    }
+
     getProfileMembers(profileId: number, filters: any) {
-        return this.Restangular.service('profiles').one(profileId).customGET("members", filters);
+        return this.get(profileId).customGET("members", filters);
+    }
+
+    getByIdentifier(identifier: string) {
+        return this.Restangular.one('profiles').get({ identifier: identifier });
+    }
+
+    getBoxes(profileId: number) {
+        return this.get(profileId).customGET('boxes');
     }
 }
	@@ -6,18 +6,7 @@		@@ -6,18 +6,7 @@
6		6
7	return {	7	return {
8	currentProfile: currentProfile.promise,	8	currentProfile: currentProfile.promise,
9	- setCurrentProfile: function(profile) { currentProfile.resolve(profile) },
10	- profiles: Restangular.service('profiles'),
11	- articles: Restangular.service('articles'),
12	- profile: function(profileId) {
13	- return Restangular.one('profiles', profileId);
14	- },
15	- members: function(profile) {
16	- return Restangular.service('members', profile);
17	- },
18	- boxes: function(profileId) {
19	- return Restangular.service('boxes', Restangular.one('profiles', profileId))
20	- }	9	+ setCurrentProfile: function(profile) { currentProfile.resolve(profile) }
21	}	10	}
22	});	11	});
23	})();	12	})();
1	import { Injectable, Inject } from "ng-forward";	1	import { Injectable, Inject } from "ng-forward";
		2	+import {Article} from "../../../app/models/interfaces";
2		3
3	@Injectable()	4	@Injectable()
4	@Inject("Restangular")	5	@Inject("Restangular")
	@@ -8,8 +9,25 @@ export class ArticleService {		@@ -8,8 +9,25 @@ export class ArticleService {
8		9
9	}	10	}
10		11
		12	+ create(profileId: number, article: Article) {
		13	+ return this.Restangular.one('profiles', profileId).customPOST(
		14	+ { article: article },
		15	+ 'articles',
		16	+ {},
		17	+ { 'Content-Type': 'application/json' }
		18	+ );
		19	+ }
		20	+
		21	+ get(articleId: number) {
		22	+ return this.Restangular.one('articles', articleId);
		23	+ }
		24	+
11	getByProfile(profileId: number, filters: any) {	25	getByProfile(profileId: number, filters: any) {
12	return this.Restangular.one('profiles', profileId).customGET('articles', filters);	26	return this.Restangular.one('profiles', profileId).customGET('articles', filters);
13	}	27	}
14		28
		29	+ getChildren(articleId: number, options: any = {}) {
		30	+ return this.get(articleId).customGET('children', options);
		31	+ }
		32	+
15	}	33	}
	@@ -8,8 +8,24 @@ export class ProfileService {		@@ -8,8 +8,24 @@ export class ProfileService {
8		8
9	}	9	}
10		10
		11	+ getActivities(profileId: number, options: any = {}) {
		12	+ return this.get(profileId).customGET("activities", options);
		13	+ }
		14	+
		15	+ get(profileId: number) {
		16	+ return this.Restangular.one('profiles', profileId);
		17	+ }
		18	+
11	getProfileMembers(profileId: number, filters: any) {	19	getProfileMembers(profileId: number, filters: any) {
12	- return this.Restangular.service('profiles').one(profileId).customGET("members", filters);	20	+ return this.get(profileId).customGET("members", filters);
		21	+ }
		22	+
		23	+ getByIdentifier(identifier: string) {
		24	+ return this.Restangular.one('profiles').get({ identifier: identifier });
		25	+ }
		26	+
		27	+ getBoxes(profileId: number) {
		28	+ return this.get(profileId).customGET('boxes');
13	}	29	}
14		30
15	}	31	}