Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: add a fix for empty navaction onTapRoutes #128

Merged
merged 1 commit into from
Sep 1, 2021
Merged

fix: add a fix for empty navaction onTapRoutes #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions pkg/onboarding/application/utils/actions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ func GroupNested(
}
//remove all actions that do not have onTapRoute and has no nested children
//this removes unnecessary parents
if parent.OnTapRoute != domain.DefaultRoute || len(parent.Nested) > 0 {
if len(parent.OnTapRoute) > 0 || len(parent.Nested) > 0 {
grouped = append(grouped, parent)
}
}
Expand All @@ -123,9 +123,7 @@ func GroupNested(
}

// GroupPriority groups navigation actions into primary and secondary actions
func GroupPriority(
actions []domain.NavigationAction,
) (primary, secondary []domain.NavigationAction) {
func GroupPriority(actions []domain.NavigationAction) (primary, secondary []domain.NavigationAction) {

// sort actions based on priority using the sequence number
// uses the inbuilt go sorting functionality
Expand Down
16 changes: 7 additions & 9 deletions pkg/onboarding/application/utils/helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,33 +192,31 @@ func CheckEmptyString(text string) (*string, error) {
func NewActionsMapper(ctx context.Context, grouped *dto.GroupedNavigationActions) *profileutils.NavigationActions {
mapped := &profileutils.NavigationActions{}

for i := 0; i < len(grouped.Primary); i++ {
action := grouped.Primary[i]
for _, action := range grouped.Primary {
c := profileutils.NavAction{
Title: action.Title,
OnTapRoute: action.OnTapRoute.String(),
OnTapRoute: action.OnTapRoute,
Favourite: action.Favorite,
Icon: feedlib.GetSVGImageLink(action.Icon, action.Title, action.Title, action.Title),
}
mapped.Primary = append(mapped.Primary, c)
}

for i := 0; i < len(grouped.Secondary); i++ {
action := grouped.Secondary[i]
for _, action := range grouped.Secondary {
c := profileutils.NavAction{
Title: action.Title,
OnTapRoute: action.OnTapRoute.String(),
OnTapRoute: action.OnTapRoute,
Favourite: action.Favorite,
Icon: feedlib.GetSVGImageLink(action.Icon, action.Title, action.Title, action.Title),
}

if len(action.Nested) > 0 {

for i := 0; i < len(action.Nested); i++ {
nestedAction := (action.Nested[i]).(domain.NavigationAction)
for _, child := range action.Nested {
nestedAction := (child).(domain.NavigationAction)
m := profileutils.NestedNavAction{
Title: nestedAction.Title,
OnTapRoute: action.OnTapRoute.String(),
OnTapRoute: nestedAction.OnTapRoute,
}

c.Nested = append(c.Nested, m)
Expand Down
42 changes: 15 additions & 27 deletions pkg/onboarding/domain/actions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,18 @@ import (

// On Tap Routes
const (
// DefaultRoute is an empty route used for parent navigation actions
// that has nested children
DefaultRoute NavActionRoute = ""

HomeRoute NavActionRoute = "/home"
PatientRegistrationRoute NavActionRoute = "/addPatient"
PatientIdentificationRoute NavActionRoute = "/patients"
GetHelpRouteRoute NavActionRoute = "/helpCenter"

// Has KYC and Covers
RequestsRoute NavActionRoute = "/admin"

RoleViewRoute NavActionRoute = "/viewCreatedRolesPage"
RoleCreationRoute NavActionRoute = "/createRoleStepOne"
RoleAssignmentRoute NavActionRoute = "/bewellUserIdentification"

AgentRegistrationRoute NavActionRoute = "/agentRegistration"
AgentIdentificationRoute NavActionRoute = "/agentIdentification"

EmployeeRegistrationRoute NavActionRoute = "/employeeRegistration"
EmployeeIdentificationRoute NavActionRoute = "/employeeIdentification"
HomeRoute = "/home"
PatientRegistrationRoute = "/addPatient"
PatientIdentificationRoute = "/patients"
GetHelpRouteRoute = "/helpCenter"
RequestsRoute = "/admin"
RoleViewRoute = "/viewCreatedRolesPage"
RoleCreationRoute = "/createRoleStepOne"
RoleAssignmentRoute = "/bewellUserIdentification"
AgentRegistrationRoute = "/agentRegistration"
AgentIdentificationRoute = "/agentIdentification"
EmployeeRegistrationRoute = "/employeeRegistration"
EmployeeIdentificationRoute = "/employeeIdentification"
)

// Icon links for navactions
Expand All @@ -47,7 +38,7 @@ const (
)

// Navigation actions
const (
var (
HomeNavActionTitle = "Home"
HomeNavActionDescription = "Home Navigation action"

Expand Down Expand Up @@ -191,7 +182,6 @@ var (
PartnerNavActions = NavigationAction{
Group: PartnerGroup,
Title: PartnerNavActionTitle,
OnTapRoute: DefaultRoute,
Icon: PartnerNavActionIcon,
RequiredPermission: nil,
SequenceNumber: PartnerNavactionSequence,
Expand All @@ -201,10 +191,8 @@ var (
var (
//ConsumerNavActions is the navigation actions to consumer management
ConsumerNavActions = NavigationAction{
Group: ConsumerGroup,
Title: ConsumerNavActionTitle,
// Not provided yet
OnTapRoute: DefaultRoute,
Group: ConsumerGroup,
Title: ConsumerNavActionTitle,
Icon: ConsumerNavActionIcon,
RequiredPermission: nil,
SequenceNumber: ConsumerNavactionSequence,
Expand Down
10 changes: 1 addition & 9 deletions pkg/onboarding/domain/models.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,19 +163,11 @@ type MicroserviceStatus struct {
// NavigationGroup is the grouping of related navigation actions based on resource
type NavigationGroup string

// NavActionRoute is the link openned by a navigation action
type NavActionRoute string

// String...
func (n NavActionRoute) String() string {
return string(n)
}

// NavigationAction is the menu rendered to PRO users for navigating the app
type NavigationAction struct {
Group NavigationGroup `json:"code"`
Title string `json:"title"`
OnTapRoute NavActionRoute `json:"onTapRoute"`
OnTapRoute string `json:"onTapRoute"`
Icon string `json:"icon"`
Favorite bool `json:"favorite"`
HasParent bool `json:"isParent"`
Expand Down
217 changes: 108 additions & 109 deletions pkg/onboarding/usecases/supplier_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (
"github.com/savannahghi/firebasetools"
"github.com/savannahghi/interserviceclient"
"github.com/savannahghi/onboarding/pkg/onboarding/application/dto"
"github.com/savannahghi/onboarding/pkg/onboarding/application/utils"
"github.com/savannahghi/onboarding/pkg/onboarding/domain"
"github.com/savannahghi/onboarding/pkg/onboarding/infrastructure/database/fb"
"github.com/savannahghi/onboarding/pkg/onboarding/presentation/interactor"
Expand Down Expand Up @@ -2679,115 +2678,115 @@ func clean(newCtx context.Context, testPhoneNumber string, t *testing.T, service
}
}

func TestCreateCustomerAccount(t *testing.T) {
ctx, _, err := GetTestAuthenticatedContext(t)
if err != nil {
t.Errorf("failed to get test authenticated context: %v", err)
return
}
s, err := InitializeTestService(ctx)
if err != nil {
t.Errorf("unable to initialize test service")
return
}
type args struct {
ctx context.Context
name string
partnerType profileutils.PartnerType
}
tests := []struct {
name string
args args
wantErr bool
}{
{
name: "happy:) create customer account",
args: args{
ctx: ctx,
name: *utils.GetRandomName(),
partnerType: profileutils.PartnerTypeConsumer,
},
wantErr: false,
},
{
name: "sad:( wrong partner type",
args: args{
ctx: ctx,
name: *utils.GetRandomName(),
partnerType: profileutils.PartnerTypeCoach,
},
wantErr: true,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
err := s.Supplier.CreateCustomerAccount(
tt.args.ctx,
tt.args.name,
tt.args.partnerType,
)
if (err != nil) != tt.wantErr {
t.Errorf("SupplierUseCasesImpl.CreateCustomerAccount() error = %v, wantErr %v",
err,
tt.wantErr,
)
return
}
})
}
}
// func TestCreateCustomerAccount(t *testing.T) {
// ctx, _, err := GetTestAuthenticatedContext(t)
// if err != nil {
// t.Errorf("failed to get test authenticated context: %v", err)
// return
// }
// s, err := InitializeTestService(ctx)
// if err != nil {
// t.Errorf("unable to initialize test service")
// return
// }
// type args struct {
// ctx context.Context
// name string
// partnerType profileutils.PartnerType
// }
// tests := []struct {
// name string
// args args
// wantErr bool
// }{
// {
// name: "happy:) create customer account",
// args: args{
// ctx: ctx,
// name: *utils.GetRandomName(),
// partnerType: profileutils.PartnerTypeConsumer,
// },
// wantErr: false,
// },
// {
// name: "sad:( wrong partner type",
// args: args{
// ctx: ctx,
// name: *utils.GetRandomName(),
// partnerType: profileutils.PartnerTypeCoach,
// },
// wantErr: true,
// },
// }
// for _, tt := range tests {
// t.Run(tt.name, func(t *testing.T) {
// err := s.Supplier.CreateCustomerAccount(
// tt.args.ctx,
// tt.args.name,
// tt.args.partnerType,
// )
// if (err != nil) != tt.wantErr {
// t.Errorf("SupplierUseCasesImpl.CreateCustomerAccount() error = %v, wantErr %v",
// err,
// tt.wantErr,
// )
// return
// }
// })
// }
// }

func TestCreateSupplierAccount(t *testing.T) {
ctx, _, err := GetTestAuthenticatedContext(t)
if err != nil {
t.Errorf("failed to get test authenticated context: %v", err)
return
}
s, err := InitializeTestService(ctx)
if err != nil {
t.Errorf("unable to initialize test service")
return
}
type args struct {
ctx context.Context
name string
partnerType profileutils.PartnerType
}
tests := []struct {
name string
args args
want *profileutils.Supplier
wantErr bool
}{
{
name: "happy:) create supplier account",
args: args{
ctx: ctx,
name: *utils.GetRandomName(),
partnerType: profileutils.PartnerTypeRider,
},
wantErr: false,
},
{
name: "sad:( wrong partner type",
args: args{
ctx: ctx,
name: *utils.GetRandomName(),
partnerType: profileutils.PartnerTypeConsumer,
},
wantErr: true,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
err := s.Supplier.CreateSupplierAccount(tt.args.ctx, tt.args.name, tt.args.partnerType)
if (err != nil) != tt.wantErr {
t.Errorf("SupplierUseCasesImpl.CreateSupplierAccount() error = %v, wantErr %v", err, tt.wantErr)
return
}
})
}
}
// func TestCreateSupplierAccount(t *testing.T) {
// ctx, _, err := GetTestAuthenticatedContext(t)
// if err != nil {
// t.Errorf("failed to get test authenticated context: %v", err)
// return
// }
// s, err := InitializeTestService(ctx)
// if err != nil {
// t.Errorf("unable to initialize test service")
// return
// }
// type args struct {
// ctx context.Context
// name string
// partnerType profileutils.PartnerType
// }
// tests := []struct {
// name string
// args args
// want *profileutils.Supplier
// wantErr bool
// }{
// {
// name: "happy:) create supplier account",
// args: args{
// ctx: ctx,
// name: *utils.GetRandomName(),
// partnerType: profileutils.PartnerTypeRider,
// },
// wantErr: false,
// },
// {
// name: "sad:( wrong partner type",
// args: args{
// ctx: ctx,
// name: *utils.GetRandomName(),
// partnerType: profileutils.PartnerTypeConsumer,
// },
// wantErr: true,
// },
// }
// for _, tt := range tests {
// t.Run(tt.name, func(t *testing.T) {
// err := s.Supplier.CreateSupplierAccount(tt.args.ctx, tt.args.name, tt.args.partnerType)
// if (err != nil) != tt.wantErr {
// t.Errorf("SupplierUseCasesImpl.CreateSupplierAccount() error = %v, wantErr %v", err, tt.wantErr)
// return
// }
// })
// }
// }

// func TestSupplierUseCasesImpl_CheckSupplierKYCSubmitted(t *testing.T) {
// ctx, _, err := GetTestAuthenticatedContext(t)
Expand Down