release: develop changes to main (#148)

* fix: allow empty email in registration input (#59) * feat: autolink covers for sladers who receive an SMS from EDI (#44) * feat: isc endpoint to check for permission (#60) - feat: retrive users with a role, get role by name - chore: remove unused role usecases * test: fix tests for getting navigation actions usecase (#53) * chore: filter roles using filter input struct (#57) * fix: ensure that returned navigation actions are in the order required (#58) * chore: update email templates (#62) Co-authored-by: Willard Shikami <shikami@savannahinformatics.com> * ref: ordering navigation actions using priority (#68) - chore: add employee navigation actions * fix: change role filter to search role by role name (#67) * chore: update registered user welcome message (#70) fix: return empty list for missing role in role search * feat: add permission scopes in login response (#69) * feat: layout community onboarding service deployment (#72) * feat: layout community onboarding service deployment [ ] Build and push docker image to GCR [ ] Deploy the revision to Cloud Run via CI [ ] Make this workflow stage depend on CI test and lint workflow Signed-off-by: Otieno Calvine <nyarangaotieno@gmail.com> * feat: for lint and test workflow to complete and succeed before running deployment workflow Signed-off-by: Otieno Calvine <nyarangaotieno@gmail.com> * configure enviroment and job concurrency group Signed-off-by: Otieno Calvine <nyarangaotieno@gmail.com> * fix: flagged feature disabled on token refresh (#75) * refactor purge user (#77) * feat: add service deployment job (#74) [ ] Deploy test server to Google Cloud Run [ ] Supply secrets via Google Secret Manager Signed-off-by: Otieno Calvine <nyarangaotieno@gmail.com> * chore: add gitguardian security check and limit deployment to test servers to only develop branch (#78) Signed-off-by: Otieno Calvine <nyarangaotieno@gmail.com> * fix: set-env-vars for root collection suffix (#81) Signed-off-by: Otieno Calvine <nyarangaotieno@gmail.com> * tests: role management integration and acceptance tests (#63) Signed-off-by: Otieno Calvine <nyarangaotieno@gmail.com> * fix: root collection and sentry dns env (#83) Signed-off-by: Otieno Calvine <nyarangaotieno@gmail.com> * feat: listing role members in role output and role details in user response (#84) - assigning multiple roles * feat: add and save role revocation reason (#73) chore: roles in admin and agent response * feat: add AgentProfile to users registered as agents (#76) * feat: add searching admin by phone (#79) * feat: add sending temporary pin to users on demand (#54) * Revert "feat: add sending temporary pin to users on demand (#54)" (#89) This reverts commit 1ff99b7. * chore: add ci schema validation command (#88) Signed-off-by: Otieno Calvine <nyarangaotieno@gmail.com> * chore: remove test roles (#90) * feat: add register user rest endpoint (#105) * feat: add register user rest endpoint (#115) * feat: add register user rest endpoint (#116) * chore: make createdByID an optional attribute when creating a user profile (#124) * chore: remove email address as required user response (#127) * fix: add a fix for empty navaction onTapRoutes (#128) * chore: add consumer registration route (#130) * fix: add required permission to consumer navigation action (#133) Co-authored-by: Charles Muchogo <48381664+Muchogoc@users.noreply.github.com> Co-authored-by: Salaton <nairouasalaton@gmail.com> Co-authored-by: Richard Ochom <ochomrichard752@gmail.com> Co-authored-by: Shikami <46521311+willshikami@users.noreply.github.com> Co-authored-by: Willard Shikami <shikami@savannahinformatics.com> Co-authored-by: Kennedy Kori <kennedykori47@gmail.com> Co-authored-by: Kathurima Kimathi <41376826+KathurimaKimathi@users.noreply.github.com>
savannahghi · Sep 8, 2021 · 3de76b6 · 3de76b6
1 parent 642dc8a
commit 3de76b6
Show file tree

Hide file tree

Showing 55 changed files with 6,822 additions and 2,330 deletions.
diff --git a/.gitguardian.yaml b/.gitguardian.yaml
@@ -0,0 +1,14 @@
+all-policies: false
+api-url: https://api.gitguardian.com
+exit-zero: false
+matches-ignore:
+  - name: token
+    match: QP18DqWVyuOcPG8CcDUNcEDzU3A2
+paths-ignore:
+  - '**/README.md'
+  - doc/*
+  - LICENSE
+  - .dockerignore
+  - .gitignore
+show-secrets: false
+verbose: false
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -51,6 +51,11 @@ env:
   JWT_KEY: ${{ secrets.JWT_KEY }}
   SAVANNAH_ADMIN_EMAIL: ${{ secrets.SAVANNAH_ADMIN_EMAIL }}
 
+  # Schema Registry CLI command version
+  CLI_VERSION: v0.0.1
+  #Schema Registry URL
+  REGISTRY_URL: ${{ secrets.TEST_SCHEMA_REGISTRY_URL }}
+
 concurrency:
   group: lint-and-test
 
@@ -67,9 +72,9 @@ jobs:
       - run: git config --global url."https://${user}:${ACCESS_TOKEN}@gitlab.slade360emr.com".insteadOf "https://gitlab.slade360emr.com"
       - uses: google-github-actions/setup-gcloud@master
         with:
-            project_id: ${{ secrets.GOOGLE_CLOUD_PROJECT }}
-            service_account_key: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
-            export_default_credentials: true
+          project_id: ${{ secrets.GOOGLE_CLOUD_PROJECT }}
+          service_account_key: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
+          export_default_credentials: true
       - name: Install Go
         uses: actions/setup-go@v2
         with:
@@ -89,10 +94,12 @@ jobs:
           go get github.com/fzipp/gocyclo
           go get github.com/stretchr/testify/assert@v1.7.0
           go get github.com/ory/go-acc
+          go install github.com/savannahghi/bewellcli@$CLI_VERSION
 
       - name: Run lint and test
         run: |
           staticcheck ./...
+          bewellcli service validate-schema --name onboarding --version $GITHUB_SHA --url ${{ secrets.SERVICE_GRAPHQL_URL }}
           go fmt $(go list ./... | grep -v /vendor/)
           go vet $(go list ./... | grep -v /vendor/)
           golint -set_exit_status $(go list ./... | grep -v /vendor/)
@@ -105,7 +112,7 @@ jobs:
           gocov convert coverage.out > coverage.json
           gocov report coverage.json > coverage_report.txt
           tail coverage_report.txt
-        
+
       - name: Install goveralls
         env:
           GO111MODULE: off

diff --git a/.github/workflows/deployment.yaml b/.github/workflows/deployment.yaml
@@ -69,8 +69,6 @@ jobs:
           --set-env-vars "FIREBASE_WEB_API_KEY=${{ secrets.FIREBASE_WEB_API_KEY }}" \
           --set-env-vars "JWT_KEY=${{ secrets.JWT_KEY }}" \
           --set-env-vars "ENVIRONMENT=${{ secrets.ENVIRONMENT }}" \
-          --set-env-vars "SENTRY_DSN=${{ secrets.SENTRY_DSN }}" \
-          --set-env-vars "ROOT_COLLECTION_SUFFIX="${{ secrets.ROOT_COLLECTION_SUFFIX }}" \
           --set-env-vars "ERP_HOST=${{ secrets.ERP_HOST }}" \
           --set-env-vars "ERP_API_SCHEME=${{ secrets.ERP_API_SCHEME }}" \
           --set-env-vars "ERP_TOKEN_URL=${{ secrets.ERP_TOKEN_URL }}" \
@@ -109,4 +107,6 @@ jobs:
           --set-env-vars "SAVANNAH_ADMIN_EMAIL=${{ secrets.SAVANNAH_ADMIN_EMAIL }}" \
           --set-env-vars "HUBSPOT_API_KEY=${{ secrets.HUBSPOT_API_KEY }}" \
           --set-env-vars "HUBSPOT_API_URL=${{ secrets.HUBSPOT_API_URL }}" \
-          --set-env-vars "JAEGER_URL=${{ secrets.JAEGER_URL }}" 
+          --set-env-vars "JAEGER_URL=${{ secrets.JAEGER_URL }}" \
+          --set-env-vars "SENTRY_DSN=${{ secrets.SENTRY_DSN }}" \
+          --set-env-vars "ROOT_COLLECTION_SUFFIX=${{ secrets.ROOT_COLLECTION_SUFFIX }}" 
diff --git a/go.sum b/go.sum
@@ -118,8 +118,10 @@ github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcju
 github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
 github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
+github.com/cpuguy83/go-md2man v1.0.10 h1:BSKMNlYxDvnunlTymqtgONjNnaRV1sTpcovwwjF22jk=
 github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
 github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
+github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY=
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -363,7 +365,9 @@ github.com/rs/cors v1.6.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU=
 github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
 github.com/rs/xid v1.3.0 h1:6NjYksEUlhurdVehpc7S7dk6DAmcKv8V9gG0FsVN2U4=
 github.com/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
+github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
+github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q=
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/savannahghi/converterandformatter v0.0.3/go.mod h1:0o7yieYU10WabPqKuqj+5QL52eTL1eGElxjb+A68bbA=
@@ -412,6 +416,7 @@ github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNX
 github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ=
 github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
 github.com/shurcooL/httpfs v0.0.0-20171119174359-809beceb2371/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg=
+github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/shurcooL/vfsgen v0.0.0-20180121065927-ffb13db8def0/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw=
 github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
@@ -445,6 +450,7 @@ github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGr
 github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
 github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
+github.com/urfave/cli/v2 v2.1.1 h1:Qt8FeAtxE/vfdrLmR3rxR6JRE0RoVmbXu8+6kZtYU4k=
 github.com/urfave/cli/v2 v2.1.1/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ=
 github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=

diff --git a/pkg/onboarding/application/common/common.go b/pkg/onboarding/application/common/common.go
@@ -6,80 +6,6 @@ var AuthorizedEmails = []string{"apa-dev@healthcloud.co.ke", "apa-prod@healthclo
 // AuthorizedPhones represent phonenumbers to check whether they have access to certain dto
 var AuthorizedPhones = []string{"+254700000000"}
 
-// Icon links for navactions
-const (
-	// StaticBase is the default path at which static assets are hosted
-	StaticBase = "https://assets.healthcloud.co.ke"
-
-	RoleNavActionIcon     = StaticBase + "/actions/roles_navaction.png"
-	AgentNavActionIcon    = StaticBase + "/actions/agent_navaction.png"
-	EmployeeNavActionIcon = StaticBase + "/actions/employee_navaction.png"
-	ConsumerNavActionIcon = StaticBase + "/actions/consumer_navaction.png"
-	HelpNavActionIcon     = StaticBase + "/actions/help_navaction.png"
-	HomeNavActionIcon     = StaticBase + "/actions/home_navaction.png"
-	KYCNavActionIcon      = StaticBase + "/actions/kyc_navaction.png"
-	PartnerNavActionIcon  = StaticBase + "/actions/partner_navaction.png"
-	PatientNavActionIcon  = StaticBase + "/actions/patient_navaction.png"
-	RequestNavActionIcon  = StaticBase + "/actions/request_navaction.png"
-)
-
-// On Tap Routes
-const (
-	HomeRoute                  = "/home"
-	PatientRegistrationRoute   = "/addPatient"
-	PatientIdentificationRoute = "/patients"
-	GetHelpRouteRoute          = "/helpCenter"
-
-	// Has KYC and Covers
-	RequestsRoute = "/admin"
-
-	RoleViewRoute     = "/viewCreatedRolesPage"
-	RoleCreationRoute = "/createRoleStepOne"
-
-	AgentRegistrationRoute   = "/agentRegistration"
-	AgentIdentificationRoute = "/agentIdentification"
-
-	EmployeeRegistrationRoute   = "/employeeRegistration"
-	EmployeeIdentificationRoute = "/employeeIdentification"
-)
-
-// Navigation actions
-const (
-	HomeNavActionTitle       = "Home"
-	HomeNavActionDescription = "Home Navigation action"
-
-	HelpNavActionTitle       = "Help"
-	HelpNavActionDescription = "Help Navigation action"
-
-	RoleNavActionTitle      = "Role Management"
-	RoleViewActionTitle     = "View Roles"
-	RoleCreationActionTitle = "Create Role"
-
-	PatientNavActionTitle            = "Patients"
-	PatientNavActionDescription      = "Patient Navigation action"
-	PatientRegistrationActionTitle   = "Register Patient"
-	PatientIdentificationActionTitle = "Search Patient"
-
-	RequestsNavActionTitle       = "Requests"
-	RequestsNavActionDescription = "Requests Navigation action"
-
-	AgentNavActionTitle            = "Agents"
-	AgentNavActionDescription      = "Agent Navigation action"
-	AgentRegistrationActionTitle   = "Register Agent"
-	AgentIdentificationActionTitle = "View Agents"
-
-	EmployeeNavActionTitle            = "Employees"
-	EmployeeNavActionDescription      = "Employee Navigation action"
-	EmployeeRegistrationActionTitle   = "Register Employee"
-	EmployeeIdentificationActionTitle = "View Employees"
-
-	ConsumerNavActionTitle       = "Consumers"
-	ConsumerNavActionDescription = "Consumer Navigation action"
-
-	PartnerNavActionTitle       = "Partners"
-	PartnerNavActionDescription = "Partner Navigation action"
-)
-
 // PubSub topic names
 const (
 	// CreateCustomerTopic is the TopicID for customer creation Topic

diff --git a/pkg/onboarding/application/dto/input.go b/pkg/onboarding/application/dto/input.go
@@ -402,6 +402,18 @@ type CoverLinkingEvent struct {
 	PhoneNumber           string     `firestore:"phoneNumber"`
 }
 
+// AssignRolePayload is the payload used to assign a role to a user
+type AssignRolePayload struct {
+	UserID string `json:"userID"`
+	RoleID string `json:"roleID"`
+}
+
+// DeleteRolePayload is the payload used to delete a role
+type DeleteRolePayload struct {
+	Name   string `json:"name"`
+	RoleID string `json:"roleID"`
+}
+
 // RoleInput represents the information required when creating a role
 type RoleInput struct {
 	Name        string   `json:"name"`
@@ -429,8 +441,9 @@ type RetrieveUserProfileInput struct {
 
 //ProfileSuspensionInput is the input required to suspend/unsuspend a PRO account
 type ProfileSuspensionInput struct {
-	ID     string `json:"id,omitempty"`
-	Reason string `json:"reason,omitempty"`
+	ID      string   `json:"id"`
+	RoleIDs []string `json:"roleIDs"`
+	Reason  string   `json:"reason"`
 }
 
 // EDICoverLinkingPubSubMessage holds the data required to add a cover to the profile
@@ -447,3 +460,24 @@ type CheckPermissionPayload struct {
 	UID        *string                  `json:"uid"`
 	Permission *profileutils.Permission `json:"permission"`
 }
+
+// RoleRevocationInput is the input when revoking a user's role
+type RoleRevocationInput struct {
+	ProfileID string
+	RoleID    string
+	Reason    string
+}
+
+// RegisterUserInput is the data required to creat a new user.
+// this data can be used by cross service requests
+type RegisterUserInput struct {
+	UID            *string           `json:"uid,omitempty"`
+	FirstName      *string           `json:"firstName,omitempty"`
+	LastName       *string           `json:"lastName,omitempty"`
+	Gender         *enumutils.Gender `json:"gender,omitempty"`
+	PhoneNumber    *string           `json:"phoneNumber,omitempty"`
+	Email          *string           `json:"email,omitempty"`
+	DateOfBirth    *scalarutils.Date `json:"dateOfBirth,omitempty"`
+	RoleIDs        []string          `json:"roleIDs,omitempty"`
+	WelcomeMessage *string           `json:"welcomeMessage,omitempty"`
+}
diff --git a/pkg/onboarding/application/dto/output.go b/pkg/onboarding/application/dto/output.go
@@ -54,6 +54,8 @@ type Agent struct {
 	// Resend PIN helps inform the whether a send new temporary PIN
 	// True when the user hasn't performed the initial sign up to change PIN
 	ResendPIN bool `json:"resendPIN"`
+
+	Roles []RoleOutput `json:"roles"`
 }
 
 // Admin represents agent with details inferred from their user profile
@@ -79,6 +81,8 @@ type Admin struct {
 	// Resend PIN helps inform the whether a send new temporary PIN
 	// True when the user hasn't performed the initial sign up to change PIN
 	ResendPIN bool `json:"resendPIN"`
+
+	Roles []RoleOutput `json:"roles"`
 }
 
 // AccountRecoveryPhonesResponse  payload sent back to the frontend when recovery an account
@@ -143,16 +147,24 @@ type Segment struct {
 
 // RoleOutput is the formatted output with scopes and permissions
 type RoleOutput struct {
-	ID          string                    `json:"id"`
-	Name        string                    `json:"name"`
-	Description string                    `json:"description"`
-	Active      bool                      `json:"active"`
-	Scopes      []string                  `json:"scopes"`
-	Permissions []profileutils.Permission `json:"permissions"`
+	ID          string                      `json:"id"`
+	Name        string                      `json:"name"`
+	Description string                      `json:"description"`
+	Active      bool                        `json:"active"`
+	Scopes      []string                    `json:"scopes"`
+	Permissions []profileutils.Permission   `json:"permissions"`
+	Users       []*profileutils.UserProfile `json:"users"`
 }
 
 // GroupedNavigationActions is the list of Navigation Actions sorted into primary and secondary actions
 type GroupedNavigationActions struct {
 	Primary   []domain.NavigationAction `json:"primary,omitempty"`
 	Secondary []domain.NavigationAction `json:"secondary,omitempty"`
 }
+
+// RegisteredUserResponse is used to return by creating a new user in ISC
+type RegisteredUserResponse struct {
+	ID          string `json:"id,omitempty"`
+	DisplayName string `json:"displayName,omitempty"`
+	PhoneNumber string `json:"phoneNumber,omitempty"`
+}
diff --git a/pkg/onboarding/application/utils/actions.go b/pkg/onboarding/application/utils/actions.go
@@ -112,16 +112,18 @@ func GroupNested(
 				parent.Nested = append(parent.Nested, action)
 			}
 		}
-		grouped = append(grouped, parent)
+		//remove all actions that do not have onTapRoute and has no nested children
+		//this removes unnecessary parents
+		if len(parent.OnTapRoute) > 0 || len(parent.Nested) > 0 {
+			grouped = append(grouped, parent)
+		}
 	}
 
 	return grouped
 }
 
 // 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

diff --git a/pkg/onboarding/application/utils/helpers.go b/pkg/onboarding/application/utils/helpers.go
@@ -192,8 +192,7 @@ 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,
@@ -203,8 +202,7 @@ func NewActionsMapper(ctx context.Context, grouped *dto.GroupedNavigationActions
 		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,
@@ -214,8 +212,8 @@ func NewActionsMapper(ctx context.Context, grouped *dto.GroupedNavigationActions
 
 		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: nestedAction.OnTapRoute,

diff --git a/pkg/onboarding/application/utils/helpers_test.go b/pkg/onboarding/application/utils/helpers_test.go
@@ -10,7 +10,6 @@ import (
 	"github.com/savannahghi/onboarding/pkg/onboarding/application/utils"
 	"github.com/savannahghi/onboarding/pkg/onboarding/domain"
 	"github.com/savannahghi/profileutils"
-	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
 	"gitlab.slade360emr.com/go/apiclient"
 )
@@ -488,7 +487,6 @@ func TestNewActionsMapper(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			got := utils.NewActionsMapper(tt.args.ctx, tt.args.grouped)
-			logrus.Println(got)
 			if got == nil {
 				t.Errorf("NewActionsMapper() = %v, want %v", got, tt.want)
 			}