Support for role config and operator info (#167)

* Use configuration for role names

* Replace Owner by seller role

* Configure certifier role

* Fix issues with routes and role config

* Use ID when quering offers by related party

* Fix bug with wrong organization ID in the shopping cart

* Fix bug reading the party when adding to the cart

* Remove unused env import

* Add link to the Profile section for accessing the payment system

* ADD adhoc offer's form first approach (#150)

* ADD first approach to custom offer form

* ADD step validation and proper selection of parties

* FIX ad hoc offer's form

* Add button for downloading invoices

* Allow to update the billNo in the CustomerBill

* Remove hardcoding in orgAdmin roles

---------

Co-authored-by: Lara Miñones <49403564+laraminones@users.noreply.github.com>

Author: fdelavega

cypress/e2e/catalog.cy.ts

@@ -16,7 +16,7 @@ describe('/my-offerings',{
         const status = 'Active'
         const newCatalog = { id: 'test', href: 'test',name: name, description: description, lifecycleStatus: status, relatedParty: {
             id: local_items.partyId,
-            role: 'Owner',
+            role: 'Seller',
             '@referredType': ''
         }}
         let calls = 0
@@ -52,12 +52,12 @@ describe('/my-offerings',{
         const status = 'Active'
         const newCatalog = { id: 'test', href: 'test',name: name, description: description, lifecycleStatus: status, relatedParty: {
             id: local_items.partyId,
-            role: 'Owner',
+            role: 'Seller',
             '@referredType': ''
         }}
         const getCatalog = { id: 'test', href: 'test',name: check, description: description, lifecycleStatus: status, relatedParty: {
             id: local_items.partyId,
-            role: 'Owner',
+            role: 'Seller',
             '@referredType': ''
         }}
         let calls = 0

cypress/e2e/offering.cy.ts

@@ -24,7 +24,7 @@ describe('/my-offerings',{
 
         const newCatalog = { id: 'test', href: 'test',name: 'catalogTest', description: '', lifecycleStatus: 'Launched', relatedParty: [{
             id: local_items.partyId,
-            role: 'Owner',
+            role: 'Seller',
             '@referredType': ''
         }]}
 
@@ -75,7 +75,7 @@ describe('/my-offerings',{
 
         const newCatalog = { id: 'catalogId', href: 'catalogId',name: 'catalogTest', description: '', lifecycleStatus: 'Launched', relatedParty: [{
             id: local_items.partyId,
-            role: 'Owner',
+            role: 'Seller',
             '@referredType': ''
         }]}
 
@@ -154,7 +154,7 @@ describe('/my-offerings',{
 
         const newCatalog = { id: 'catalogId', href: 'catalogId',name: 'catalogTest', description: '', lifecycleStatus: 'Launched', relatedParty: [{
             id: local_items.partyId,
-            role: 'Owner',
+            role: 'Seller',
             '@referredType': ''
         }]}
 
@@ -168,7 +168,7 @@ describe('/my-offerings',{
                     {
                         "id": "mock:organization",
                         "href": "mock:organization",
-                        "role": "owner",
+                        "role": "Seller",
                         "@referredType": null
                     }
                 ],
@@ -262,7 +262,7 @@ describe('/my-offerings',{
 
         const newCatalog = { id: 'catalogId', href: 'catalogId',name: 'catalogTest', description: '', lifecycleStatus: 'Launched', relatedParty: [{
             id: local_items.partyId,
-            role: 'Owner',
+            role: 'Seller',
             '@referredType': ''
         }]}
 

cypress/support/constants.ts

@@ -157,7 +157,7 @@ export const catalog_launched = [
             {
                 "id": "urn:ngsi-ld:individual:b73dd8ce-b63f-4c5b-be07-ca7ea10ad78e",
                 "href": "urn:ngsi-ld:individual:b73dd8ce-b63f-4c5b-be07-ca7ea10ad78e",
-                "role": "Owner",
+                "role": "Seller",
                 "@referredType": ""
             }
         ],
@@ -313,7 +313,7 @@ export const productOffering = {
         {
             id: "urn:ngsi-ld:individual:56c77de4-f136-4167-95f0-92a36983ee0f",
             href: "urn:ngsi-ld:individual:56c77de4-f136-4167-95f0-92a36983ee0f",
-            role: "Owner",
+            role: "Seller",
             "@referredType": ""
         }
     ]
@@ -331,7 +331,7 @@ export const productSpec = {
         {
             id: "urn:ngsi-ld:individual:56c77de4-f136-4167-95f0-92a36983ee0f",
             href: "urn:ngsi-ld:individual:56c77de4-f136-4167-95f0-92a36983ee0f",
-            role: "Owner",
+            role: "Seller",
             "@referredType": ""
         }
     ],

src/app/app-routing.module.ts

@@ -23,7 +23,7 @@ import { UsageSpecsComponent } from "src/app/pages/usage-specs/usage-specs.compo
 import { DomeBlogComponent } from "src/app/pages/dome-blog/dome-blog.component"
 import { BlogEntryDetailComponent } from "src/app/pages/dome-blog/blog-entry-detail/blog-entry-detail.component"
 import { EntryFormComponent } from "src/app/pages/dome-blog/entry-form/entry-form.component"
-import { environment } from '../environments/environment';
+
 
 
 const routes: Routes = [

src/app/app.module.ts

@@ -86,6 +86,7 @@ import { MultipleSelectComponent } from './shared/multiple-select/multiple-selec
 import {CharacteristicComponent} from "./shared/characteristic/characteristic.component";
 import {PricePlanDrawerComponent} from "./shared/price-plan-drawer/price-plan-drawer.component";
 import {OfferComponent} from "./shared/forms/offer/offer.component";
+import {CustomOfferComponent} from "./shared/forms/offer/custom-offer/custom-offer.component"
 import { ThemeService } from './services/theme.service';
 import { ThemeAwareTranslateLoader } from './services/theme-aware-translate.loader';
 import { RevenueReportComponent } from './shared/revenue-report/revenue-report.component'
@@ -196,6 +197,7 @@ import { OperatorRevenueSharingComponent } from "src/app/pages/admin/operator-re
         PricePlanDrawerComponent,
         RevenueReportComponent,
         OfferComponent,
+        CustomOfferComponent,
         AboutDomeComponent,
         MarkdownTextareaComponent,
         ProviderRevenueSharingComponent,

src/app/chatbot-widget/chatbot-widget.component.ts

@@ -62,14 +62,14 @@ export class ChatbotWidgetComponent {
 
     // Build the message depending on the user role
     let name = "guest"
-    let role = "Customer" // FIXME: Default role must be guest when supported
+    let role = environment.BUYER_ROLE; // FIXME: Default role must be guest when supported
 
     const userInfo = this.localStorage.getObject('login_items') as LoginInfo;
 
     // The user is logged in
     if (userInfo.id) {
       let roles = []
-      role = "Customer"
+      role = environment.BUYER_ROLE;
       name = userInfo.username
 
       if (userInfo.logged_as !== userInfo.id) {
@@ -83,7 +83,7 @@ export class ChatbotWidgetComponent {
         })
       }
 
-      if (roles.includes("seller")) {
+      if (roles.includes(environment.SELLER_ROLE)) {
         role = "Provider"
       }
     }

src/app/features/quotes/services/quote.service.ts

@@ -172,9 +172,9 @@ export class QuoteService {
   getQuotesByUserAndRole(userId: string, role: 'customer' | 'seller'): Observable<Quote[]> {
     let params = new HttpParams();
     // API expects 'Customer' or 'Seller' (capitalized)
-    const apiRole = role === 'customer' ? 'Customer' : 'Seller';
+    const apiRole = role === 'customer' ? environment.BUYER_ROLE : environment.SELLER_ROLE;
     params = params.set('role', apiRole);
-    
+
     const encodedUserId = encodeURIComponent(userId);
     console.log('Getting quotes by user with URL:', `${this.apiUrl}/quoteByUser/${encodedUserId}`);
     return this.http.get<Quote[]>(`${this.apiUrl}/quoteByUser/${encodedUserId}`, { params, ...this.httpOptions });

src/app/guard/auth.guard.ts

@@ -4,6 +4,7 @@ import {LocalStorageService} from "../services/local-storage.service";
 import { Observable } from 'rxjs';
 import { LoginInfo } from '../models/interfaces';
 import * as moment from 'moment';
+import { environment } from 'src/environments/environment';
 
 @Injectable({
   providedIn: 'root',
@@ -18,21 +19,27 @@ export class AuthGuard implements CanActivate {
   ): Observable<boolean> | Promise<boolean> | boolean {
     let aux = this.localStorage.getObject('login_items') as LoginInfo;
     const requiredRoles = route.data['roles'] as Array<string>;
-    let userRoles: string | any[] = [];
+    let userRoles: string[] = [];
+
+    const roleMapper:any = {
+      'admin': environment.ADMIN_ROLE.toLowerCase(),
+      'seller': environment.SELLER_ROLE.toLowerCase(),
+      'buyer': environment.BUYER_ROLE.toLowerCase(),
+      'orgAdmin': environment.ORG_ADMIN_ROLE.toLowerCase(),
+      'certifier': environment.CERTIFIER_ROLE.toLowerCase(),
+      'individual': 'individual'
+    }
 
     if(JSON.stringify(aux) != '{}' && (((aux.expire - moment().unix())-4) > 0)) {
       if(aux.logged_as == aux.id){
         userRoles.push('individual')
-        for(let i=0; i < aux.roles.length; i++){
-          userRoles.push(aux.roles[i].name)
-        }
+        aux.roles.forEach((role: any) => userRoles.push(role.name.toLowerCase()))
       } else {
         let loggedOrg = aux.organizations.find((element: { id: any; }) => element.id == aux.logged_as)
-        for(let i=0;i<loggedOrg.roles.length;i++){
-          userRoles.push(loggedOrg.roles[i].name)
-        }
-        if(aux.roles.some(role => role.name === 'admin')){
-          userRoles.push('admin')
+        loggedOrg.roles.forEach((role: any) => userRoles.push(role.name.toLowerCase()))
+
+        if(aux.roles.some(role => role.name.toLowerCase() === environment.ADMIN_ROLE.toLowerCase())){
+          userRoles.push(environment.ADMIN_ROLE.toLowerCase())
         }
       }
     } else {
@@ -41,7 +48,9 @@ export class AuthGuard implements CanActivate {
     }
 
     if (requiredRoles.length != 0) {
-      const hasRequiredRoles = requiredRoles.some(role => userRoles.includes(role));
+      const hasRequiredRoles = requiredRoles.some((role: any) => {
+        return userRoles.includes(roleMapper[role]);
+      });
 
       if (!hasRequiredRoles) {
         this.router.navigate(['/dashboard']);  // Navigate to an access denied page or login page

src/app/pages/checkout/checkout.component.ts

@@ -268,7 +268,7 @@ export class CheckoutComponent implements OnInit, OnDestroy {
           {
             id: this.relatedParty,
             href: this.relatedParty,
-            role: 'Customer'
+            role: environment.BUYER_ROLE
           }
         ],
         priority: '4',
@@ -422,7 +422,7 @@ export class CheckoutComponent implements OnInit, OnDestroy {
 
   groupItemsByOwner(ownerId: any) {
     const itemsForOwner = this.items.filter((item: any) => {
-      const owner = item.relatedParty?.find((rp: any) => rp.role === 'Owner')?.id;
+      const owner = item.relatedParty?.find((rp: any) => rp.role === environment.SELLER_ROLE)?.id;
       return owner === ownerId;
     });
 
@@ -507,15 +507,20 @@ export class CheckoutComponent implements OnInit, OnDestroy {
         ba.selected = false;
       }
       this.selectedBillingAddress = baddr;
+      console.log('billing addr selected....')
+      console.log(this.selectedBillingAddress)
       const updatedItems = JSON.parse(JSON.stringify(this.items)); // we need a deep clone isntead of shallow clone
+
       for (const cartItem of updatedItems){
+        console.log('---- cart item ----')
+        console.log(cartItem)
           const response = await lastValueFrom( this.priceService.calculatePrice({
                 "productOrder":{
                     "id": uuidv4(),
                     "productOrderItem":[{
                       action: "add",
                       id: cartItem.id, // product offering id
-                      itemTotalPrice:[{
+                      itemTotalPrice: cartItem.options.pricing.length == 0 ? [] : [{
                         productOfferingPrice:{
                           id: cartItem.options.pricing[0].id, //product offering price parent id
                           href: cartItem.options.pricing[0].id,

src/app/pages/product-details/product-details.component.ts

@@ -861,10 +861,10 @@ async deleteProduct(product: Product | undefined){
     let parties = this.prodSpec?.relatedParty;
     if(parties)
     for(let i=0; i<parties.length;i++){
-      if(parties[i].role=='Owner'){
+      if(parties[i].role == environment.SELLER_ROLE){
         if(parties[i].id.includes('organization')){
           this.accService.getOrgInfo(parties[i].id).then(org => {
-            this.orgInfo=org;
+            this.orgInfo = org;
             console.log(this.orgInfo)
           })
         }