Merge "Fix groupId for nonrtric-controlpanel-gateway"

[portal/nonrtric-controlpanel.git] / webapp-frontend / src / app / services / policy / policy.service.ts

diff --git a/webapp-frontend/src/app/services/policy/policy.service.ts b/webapp-frontend/src/app/services/policy/policy.service.ts
index c903b2c..15ab710 100644 (file)
--- a/webapp-frontend/src/app/services/policy/policy.service.ts
+++ b/webapp-frontend/src/app/services/policy/policy.service.ts
@@ -22,8 +22,9 @@ import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { PolicyInstance, PolicyInstanceAck, PolicyType, PolicyTypes } from '../../interfaces/policy.types';
+import { PolicyInstance, PolicyInstanceAck, PolicyInstances, PolicyStatus, PolicyType, PolicyTypes } from '../../interfaces/policy.types';
 import { ControlpanelSuccessTransport } from '../../interfaces/controlpanel.types';
+import { Ric } from 'src/app/interfaces/ric';
 
 /**
  * Services for calling the policy endpoints.
@@ -33,8 +34,8 @@ import { ControlpanelSuccessTransport } from '../../interfaces/controlpanel.type
 })
 export class PolicyService {
 
-    private apiVersion2 = 'v2'
-    private basePath = '';
+    private apiVersion2 = '/v2'
+    private basePath = '/a1-policy';
     policyTypesPath = 'policy-types';
     policyPath = 'policies';
 
@@ -60,9 +61,19 @@ export class PolicyService {
         return this.httpClient.get<PolicyType>(url);
     }
 
-    getPolicyInstances(policyTypeId: string): Observable<PolicyInstance[]> {
-        const url = this.buildPath(this.policyPath) + '?type=' + policyTypeId;
-        return this.httpClient.get<PolicyInstance[]>(url);
+    getPolicyInstancesByType(policyTypeId: string): Observable<PolicyInstances> {
+        const url = this.buildPath(this.policyPath + '?' + 'policytype_id=' + policyTypeId);
+        return this.httpClient.get<PolicyInstances>(url);
+    }
+
+    getPolicyInstance(policyId: string): Observable<PolicyInstance> {
+        const url = this.buildPath(this.policyPath) + '/' + policyId;
+        return this.httpClient.get<PolicyInstance>(url);
+    }
+
+    getPolicyStatus(policyId: string): Observable<PolicyStatus> {
+        const url = this.buildPath(this.policyPath) + '/' + policyId + '/status';
+        return this.httpClient.get<PolicyStatus>(url);
     }
 
     /**
@@ -98,8 +109,8 @@ export class PolicyService {
     }
 
 
-    getRics(policyTypeId: string): Observable<string[]> {
-        const url = this.buildPath('rics') + '?policyType=' + policyTypeId;
+    getRics(policyTypeId: string): Observable<Ric[]> {
+        const url = this.buildPath('rics') + '?policytype_id=' + policyTypeId;
         return this.httpClient.get<any>(url);
     }
 }