B 21036 enforce dodid and emplid main

pkg/handlers/ghcapi/customer.go

@@ -163,7 +163,6 @@ func (h CreateCustomerWithOktaOptionHandler) Handle(params customercodeop.Create
 			payload := params.Body
 			var err error
 			var serviceMembers []models.ServiceMember
-			var edipi *string
 			var dodidUniqueFeatureFlag bool
 
 			// evaluating feature flag to see if we need to check if the DODID exists already
@@ -177,30 +176,31 @@ func (h CreateCustomerWithOktaOptionHandler) Handle(params customercodeop.Create
 			}
 
 			if dodidUniqueFeatureFlag {
-				if payload.Edipi == nil || *payload.Edipi == "" {
-					edipi = nil
-				} else {
-					query := `SELECT service_members.edipi
+				query := `SELECT service_members.edipi
 								FROM service_members
 								WHERE service_members.edipi = $1`
-					err := appCtx.DB().RawQuery(query, payload.Edipi).All(&serviceMembers)
-					if err != nil {
-						errorMsg := apperror.NewBadDataError("error when checking for existing service member")
-						payload := payloadForValidationError("Unable to create a customer", errorMsg.Error(), h.GetTraceIDFromRequest(params.HTTPRequest), validate.NewErrors())
-						return customercodeop.NewCreateCustomerWithOktaOptionUnprocessableEntity().WithPayload(payload), errorMsg
-					} else if len(serviceMembers) > 0 {
-						errorMsg := apperror.NewConflictError(h.GetTraceIDFromRequest(params.HTTPRequest), "Service member with this DODID already exists. Please use a different DODID number.")
-						payload := payloadForValidationError("Unable to create a customer", errorMsg.Error(), h.GetTraceIDFromRequest(params.HTTPRequest), validate.NewErrors())
-						return customercodeop.NewCreateCustomerWithOktaOptionUnprocessableEntity().WithPayload(payload), errorMsg
-					}
+				err := appCtx.DB().RawQuery(query, payload.Edipi).All(&serviceMembers)
+				if err != nil {
+					errorMsg := apperror.NewBadDataError("error when checking for existing service member")
+					payload := payloadForValidationError("Unable to create a customer", errorMsg.Error(), h.GetTraceIDFromRequest(params.HTTPRequest), validate.NewErrors())
+					return customercodeop.NewCreateCustomerWithOktaOptionUnprocessableEntity().WithPayload(payload), errorMsg
+				} else if len(serviceMembers) > 0 {
+					errorMsg := apperror.NewConflictError(h.GetTraceIDFromRequest(params.HTTPRequest), "Service member with this DODID already exists. Please use a different DODID number.")
+					payload := payloadForValidationError("Unable to create a customer", errorMsg.Error(), h.GetTraceIDFromRequest(params.HTTPRequest), validate.NewErrors())
+					return customercodeop.NewCreateCustomerWithOktaOptionUnprocessableEntity().WithPayload(payload), errorMsg
 				}
+			}
 
-				if len(serviceMembers) == 0 {
-					edipi = params.Body.Edipi
+			// Endpoint specific EDIPI and EMPLID check
+			// The following validation currently is only intended for the customer creation
+			// conducted by an office user such as the Service Counselor
+			if payload.Affiliation != nil && *payload.Affiliation == ghcmessages.AffiliationCOASTGUARD {
+				// EMPLID cannot be null
+				if payload.Emplid == nil {
+					errorMsg := apperror.NewConflictError(h.GetTraceIDFromRequest(params.HTTPRequest), "Service members from the Coast Guard require an EMPLID for creation.")
+					payload := payloadForValidationError("Unable to create a customer", errorMsg.Error(), h.GetTraceIDFromRequest(params.HTTPRequest), validate.NewErrors())
+					return customercodeop.NewCreateCustomerWithOktaOptionUnprocessableEntity().WithPayload(payload), errorMsg
 				}
-			} else {
-				// If the feature flag is not enabled, we will just set the dodid and continue
-				edipi = params.Body.Edipi
 			}
 
 			var newServiceMember models.ServiceMember
@@ -250,18 +250,11 @@ func (h CreateCustomerWithOktaOptionHandler) Handle(params customercodeop.Create
 				residentialAddress := addressModelFromPayload(&payload.ResidentialAddress.Address)
 				backupMailingAddress := addressModelFromPayload(&payload.BackupMailingAddress.Address)
 
-				var emplid *string
-				if *payload.Emplid == "" {
-					emplid = nil
-				} else {
-					emplid = payload.Emplid
-				}
-
 				// Create a new serviceMember using the userID
 				newServiceMember = models.ServiceMember{
 					UserID:               userID,
-					Edipi:                edipi,
-					Emplid:               emplid,
+					Edipi:                &payload.Edipi,
+					Emplid:               payload.Emplid,
 					Affiliation:          (*models.ServiceMemberAffiliation)(payload.Affiliation),
 					FirstName:            &payload.FirstName,
 					MiddleName:           payload.MiddleName,

pkg/handlers/ghcapi/customer_test.go

@@ -53,7 +53,7 @@ func (suite *HandlerSuite) TestGetCustomerHandlerIntegration() {
 	suite.NoError(getCustomerPayload.Validate(strfmt.Default))
 
 	suite.Equal(strfmt.UUID(customer.ID.String()), getCustomerPayload.ID)
-	suite.Equal(*customer.Edipi, getCustomerPayload.DodID)
+	suite.Equal(*customer.Edipi, getCustomerPayload.Edipi)
 	suite.Equal(strfmt.UUID(customer.UserID.String()), getCustomerPayload.UserID)
 	suite.Equal(customer.Affiliation.String(), getCustomerPayload.Agency)
 	suite.Equal(customer.PersonalEmail, getCustomerPayload.Email)
@@ -162,7 +162,7 @@ func (suite *HandlerSuite) TestCreateCustomerWithOktaOptionHandler() {
 			FirstName:     "First",
 			Telephone:     handlers.FmtString("223-455-3399"),
 			Affiliation:   &affiliation,
-			Edipi:         handlers.FmtString(""),
+			Edipi:         "",
 			Emplid:        handlers.FmtString(""),
 			PersonalEmail: *handlers.FmtString("email@email.com"),
 			BackupContact: &ghcmessages.BackupContact{
@@ -260,7 +260,7 @@ func (suite *HandlerSuite) TestCreateCustomerWithOktaOptionHandler() {
 			FirstName:     "First",
 			Telephone:     handlers.FmtString("223-455-3399"),
 			Affiliation:   &affiliation,
-			Edipi:         customer.Edipi,
+			Edipi:         *customer.Edipi,
 			PersonalEmail: *handlers.FmtString("email@email.com"),
 			BackupContact: &ghcmessages.BackupContact{
 				Name:  handlers.FmtString("New Backup Contact"),
@@ -298,6 +298,81 @@ func (suite *HandlerSuite) TestCreateCustomerWithOktaOptionHandler() {
 		response := handler.Handle(params)
 		suite.Assertions.IsType(&customerops.CreateCustomerWithOktaOptionUnprocessableEntity{}, response)
 	})
+
+	suite.Run("Unable to create customer of affiliation Coast Guard with no EMPLID", func() {
+		// in order to call the endpoint, we need to be an authenticated office user that's a SC
+		officeUser := factory.BuildOfficeUserWithRoles(suite.DB(), nil, []roles.RoleType{roles.RoleTypeTOO})
+		officeUser.User.Roles = append(officeUser.User.Roles, roles.Role{
+			RoleType: roles.RoleTypeServicesCounselor,
+		})
+
+		// Build provider
+		provider, err := factory.BuildOktaProvider(officeProviderName)
+		suite.NoError(err)
+
+		mockAndActivateOktaEndpoints(provider)
+
+		residentialAddress := ghcmessages.Address{
+			StreetAddress1: handlers.FmtString("123 New Street"),
+			City:           handlers.FmtString("Newcity"),
+			State:          handlers.FmtString("MA"),
+			PostalCode:     handlers.FmtString("02110"),
+		}
+
+		backupAddress := ghcmessages.Address{
+			StreetAddress1: handlers.FmtString("123 Backup Street"),
+			City:           handlers.FmtString("Backupcity"),
+			State:          handlers.FmtString("MA"),
+			PostalCode:     handlers.FmtString("02115"),
+		}
+
+		affiliation := ghcmessages.AffiliationCOASTGUARD
+
+		body := &ghcmessages.CreateCustomerPayload{
+			LastName:      "Last",
+			FirstName:     "First",
+			Telephone:     handlers.FmtString("223-455-3399"),
+			Affiliation:   &affiliation,
+			Edipi:         "1234567890",
+			PersonalEmail: *handlers.FmtString("email@email.com"),
+			BackupContact: &ghcmessages.BackupContact{
+				Name:  handlers.FmtString("New Backup Contact"),
+				Phone: handlers.FmtString("445-345-1212"),
+				Email: handlers.FmtString("newbackup@mail.com"),
+			},
+			ResidentialAddress: struct {
+				ghcmessages.Address
+			}{
+				Address: residentialAddress,
+			},
+			BackupMailingAddress: struct {
+				ghcmessages.Address
+			}{
+				Address: backupAddress,
+			},
+			CreateOktaAccount: true,
+			// when CacUser is false, this indicates a non-CAC user so CacValidated is set to true
+			CacUser: false,
+		}
+
+		defer goth.ClearProviders()
+		goth.UseProviders(provider)
+
+		request := httptest.NewRequest("POST", "/customer", nil)
+		request = suite.AuthenticateOfficeRequest(request, officeUser)
+		params := customerops.CreateCustomerWithOktaOptionParams{
+			HTTPRequest: request,
+			Body:        body,
+		}
+		handlerConfig := suite.HandlerConfig()
+		handler := CreateCustomerWithOktaOptionHandler{
+			handlerConfig,
+		}
+		response := handler.Handle(params)
+		suite.Assertions.IsType(&customerops.CreateCustomerWithOktaOptionUnprocessableEntity{}, response)
+		failedToCreateCustomerPayload := response.(*customerops.CreateCustomerWithOktaOptionUnprocessableEntity).Payload.ClientError.Detail
+		suite.Equal("ID: 00000000-0000-0000-0000-000000000000 is in a conflicting state Service members from the Coast Guard require an EMPLID for creation.", *failedToCreateCustomerPayload)
+	})
 }
 
 func (suite *HandlerSuite) TestSearchCustomersHandler() {

pkg/handlers/ghcapi/internal/payloads/model_to_payload.go

@@ -490,7 +490,7 @@ func Customer(customer *models.ServiceMember) *ghcmessages.Customer {
 	payload := ghcmessages.Customer{
 		Agency:             swag.StringValue((*string)(customer.Affiliation)),
 		CurrentAddress:     Address(customer.ResidentialAddress),
-		DodID:              swag.StringValue(customer.Edipi),
+		Edipi:              swag.StringValue(customer.Edipi),
 		Email:              customer.PersonalEmail,
 		FirstName:          swag.StringValue(customer.FirstName),
 		ID:                 strfmt.UUID(customer.ID.String()),

pkg/handlers/ghcapi/orders.go

@@ -323,24 +323,12 @@ func (h CreateOrderHandler) Handle(params orderop.CreateOrderParams) middleware.
 			}
 
 			if newOrder.OrdersType == "SAFETY" {
-				// if creating a Safety move, clear out the DoDID and OktaID for the customer
+				// if creating a Safety move, clear out the OktaID for the customer since they won't log into MilMove
 				err = models.UpdateUserOktaID(appCtx.DB(), &newOrder.ServiceMember.User, "")
 				if err != nil {
 					appCtx.Logger().Error("Authorization error updating user", zap.Error(err))
 					return orderop.NewUpdateOrderInternalServerError(), err
 				}
-
-				err = models.UpdateServiceMemberDoDID(appCtx.DB(), &newOrder.ServiceMember, nil)
-				if err != nil {
-					appCtx.Logger().Error("Authorization error updating service member", zap.Error(err))
-					return orderop.NewUpdateOrderInternalServerError(), err
-				}
-
-				err = models.UpdateServiceMemberEMPLID(appCtx.DB(), &newOrder.ServiceMember, nil)
-				if err != nil {
-					appCtx.Logger().Error("Authorization error updating service member", zap.Error(err))
-					return orderop.NewUpdateOrderInternalServerError(), err
-				}
 			}
 
 			newMove, verrs, err := newOrder.CreateNewMove(appCtx.DB(), moveOptions)

pkg/handlers/ghcapi/queues_test.go

@@ -833,7 +833,7 @@ func (suite *HandlerSuite) TestGetMoveQueuesHandlerCustomerInfoFilters() {
 		result := payload.QueueMoves[0]
 
 		suite.Len(payload.QueueMoves, 1)
-		suite.Equal("11111", result.Customer.DodID)
+		suite.Equal("11111", result.Customer.Edipi)
 	})
 
 	suite.Run("returns results matching Move ID search term", func() {
@@ -1525,7 +1525,7 @@ func (suite *HandlerSuite) TestGetServicesCounselingQueueHandler() {
 
 		suite.Len(payload.QueueMoves, 2)
 		suite.Equal(order.ServiceMember.ID.String(), result1.Customer.ID.String())
-		suite.Equal(*order.ServiceMember.Edipi, result1.Customer.DodID)
+		suite.Equal(*order.ServiceMember.Edipi, result1.Customer.Edipi)
 		suite.Equal(subtestData.needsCounselingMove.Locator, result1.Locator)
 		suite.EqualValues(subtestData.needsCounselingMove.Status, result1.Status)
 		suite.Equal(subtestData.needsCounselingEarliestShipment.RequestedPickupDate.Format(time.RFC3339Nano), (time.Time)(*result1.RequestedMoveDate).Format(time.RFC3339Nano))

src/components/CustomerHeader/CustomerHeader.test.jsx

@@ -5,7 +5,7 @@ import { mount } from 'enzyme';
 import CustomerHeader from './index';
 
 const props = {
-  customer: { last_name: 'Kerry', first_name: 'Smith', dodID: '999999999', emplid: '7777777', agency: 'COAST_GUARD' },
+  customer: { last_name: 'Kerry', first_name: 'Smith', edipi: '999999999', emplid: '7777777', agency: 'COAST_GUARD' },
   order: {
     agency: 'COAST_GUARD',
     grade: 'E_6',
@@ -25,7 +25,7 @@ const props = {
 };
 
 const propsRetiree = {
-  customer: { last_name: 'Kerry', first_name: 'Smith', dodID: '999999999' },
+  customer: { last_name: 'Kerry', first_name: 'Smith', edipi: '999999999' },
   order: {
     agency: 'NAVY',
     grade: 'E_6',
@@ -45,7 +45,7 @@ const propsRetiree = {
 };
 
 const propsUSMC = {
-  customer: { last_name: 'Kerry', first_name: 'Smith', dodID: '999999999' },
+  customer: { last_name: 'Kerry', first_name: 'Smith', edipi: '999999999' },
   order: {
     agency: 'MARINES',
     grade: 'E_6',
@@ -77,7 +77,7 @@ describe('CustomerHeader component', () => {
     expect(wrapper.find('[data-testid="nameBlock"]').text()).toContain('Kerry, Smith');
     expect(wrapper.find('[data-testid="nameBlock"]').text()).toContain('FKLCTR');
     expect(wrapper.find('[data-testid="deptPayGrade"]').text()).toContain('Coast Guard E-6');
-    expect(wrapper.find('[data-testid="dodId"]').text()).toContain('DoD ID 999999999');
+    expect(wrapper.find('[data-testid="edipi"]').text()).toContain('DoD ID 999999999');
     expect(wrapper.find('[data-testid="emplid"]').text()).toContain('EMPLID 7777777');
     expect(wrapper.find('[data-testid="infoBlock"]').text()).toContain('JBSA Lackland');
     expect(wrapper.find('[data-testid="infoBlock"]').text()).toContain('JB Lewis-McChord');

src/components/CustomerHeader/index.jsx

@@ -55,8 +55,8 @@ const CustomerHeader = ({ customer, order, moveCode, move, userRole }) => {
               {ORDERS_BRANCH_OPTIONS[`${order.agency}`]} {ORDERS_PAY_GRADE_OPTIONS[`${order.grade}`]}
             </span>
             <span className={styles.verticalBar}>|</span>
-            <span data-testid="dodId" className={styles.details}>
-              DoD ID {customer.dodID}
+            <span data-testid="edipi" className={styles.details}>
+              DoD ID {customer.edipi}
             </span>
             {isCoastGuard && (
               <>