Fix tests

- Fiddled around with some pointer stuff
- Fixed a typo that made the handleError function return the wrong error
  for conflict errors
- Fixed a typo that made the test for conflict errors use a mock
  not found response
- Gave not found error responses a payload (and refactored out the
  identical payloads used in the other error responses)
- Removed check for payload of 500 response. I'm not 100% sure if this
  is right. I see some of our handlers return payloads for 500s, and
  some that do not.

pkg/handlers/ghcapi/mto_shipment.go

@@ -893,13 +893,15 @@ func (h ReviewShipmentAddressUpdateHandler) Handle(params shipmentops.ReviewShip
 			remarks := params.Body.OfficeRemarks
 
 			response, err := h.ShipmentAddressUpdateRequester.ReviewShipmentAddressChange(appCtx, shipmentID, models.ShipmentAddressUpdateStatus(*addressApprovalStatus), *remarks)
-			fmt.Println(response)
 			handleError := func(err error) (middleware.Responder, error) {
 				appCtx.Logger().Error("ghcapi.ReviewShipmentAddressUpdateHandler", zap.Error(err))
+				payload := ghcmessages.Error{
+					Message: handlers.FmtString(err.Error()),
+				}
 
 				switch e := err.(type) {
 				case apperror.NotFoundError:
-					return shipmentops.NewReviewShipmentAddressUpdateNotFound(), err
+					return shipmentops.NewReviewShipmentAddressUpdateNotFound().WithPayload(&payload), err
 				case apperror.InvalidInputError:
 					payload := payloadForValidationError(
 						"Validation errors",
@@ -909,10 +911,10 @@ func (h ReviewShipmentAddressUpdateHandler) Handle(params shipmentops.ReviewShip
 					return shipmentops.NewReviewShipmentAddressUpdateUnprocessableEntity().WithPayload(payload), err
 				case apperror.PreconditionFailedError:
 					return shipmentops.NewReviewShipmentAddressUpdatePreconditionFailed().
-						WithPayload(&ghcmessages.Error{Message: handlers.FmtString(err.Error())}), err
-				case mtoshipment.ConflictStatusError:
+						WithPayload(&payload), err
+				case apperror.ConflictError:
 					return shipmentops.NewReviewShipmentAddressUpdateConflict().
-						WithPayload(&ghcmessages.Error{Message: handlers.FmtString(err.Error())}), err
+						WithPayload(&payload), err
 				default:
 					return shipmentops.NewReviewShipmentAddressUpdateInternalServerError(), err
 				}
@@ -921,7 +923,6 @@ func (h ReviewShipmentAddressUpdateHandler) Handle(params shipmentops.ReviewShip
 				return handleError(err)
 			}
 			payload := payloads.ShipmentAddressUpdate(response)
-			fmt.Println(payload)
 			return shipmentops.NewReviewShipmentAddressUpdateOK().WithPayload(payload), nil
 		})
 }

pkg/handlers/ghcapi/mto_shipment_test.go

@@ -2503,11 +2503,10 @@ func (suite *HandlerSuite) TestReviewShipmentAddressUpdateHandler() {
 		suite.NoError(params.Body.Validate(strfmt.Default))
 
 		response := handler.Handle(params)
-		errResponse := response.(*shipmentops.ReviewShipmentAddressUpdateUnprocessableEntity)
-		suite.IsType(shipmentops.ReviewShipmentAddressUpdateUnprocessableEntity{}, *errResponse)
+		suite.IsType(&shipmentops.ReviewShipmentAddressUpdateUnprocessableEntity{}, response)
 
+		errResponse := response.(*shipmentops.ReviewShipmentAddressUpdateUnprocessableEntity)
 		suite.NoError(errResponse.Payload.Validate(strfmt.Default))
-
 	})
 
 	suite.Run("PATCH Failure - 409 Request conflict response error", func() {
@@ -2536,7 +2535,7 @@ func (suite *HandlerSuite) TestReviewShipmentAddressUpdateHandler() {
 			ShipmentID:  *handlers.FmtUUID(addressChange.ShipmentID),
 		}
 
-		err := apperror.NewNotFoundError(uuid.Nil, "unable to create ReviewShipmentAddressChange")
+		err := apperror.NewConflictError(uuid.Nil, "unable to create ReviewShipmentAddressChange")
 
 		mockCreator.On("ReviewShipmentAddressChange",
 			mock.AnythingOfType("*appcontext.appContext"),
@@ -2548,6 +2547,7 @@ func (suite *HandlerSuite) TestReviewShipmentAddressUpdateHandler() {
 		suite.NoError(params.Body.Validate(strfmt.Default))
 
 		response := handler.Handle(params)
+		suite.NotNil(response)
 		suite.IsType(&shipmentops.ReviewShipmentAddressUpdateConflict{}, response)
 		errResponse := response.(*shipmentops.ReviewShipmentAddressUpdateConflict)
 
@@ -2592,11 +2592,9 @@ func (suite *HandlerSuite) TestReviewShipmentAddressUpdateHandler() {
 		suite.NoError(params.Body.Validate(strfmt.Default))
 
 		response := handler.Handle(params)
-		suite.IsType(shipmentops.ReviewShipmentAddressUpdateNotFound{}, response)
+		suite.IsType(&shipmentops.ReviewShipmentAddressUpdateNotFound{}, response)
 		errResponse := response.(*shipmentops.ReviewShipmentAddressUpdateNotFound)
-
 		suite.NoError(errResponse.Payload.Validate(strfmt.Default))
-
 	})
 
 	suite.Run("500 server error", func() {
@@ -2637,10 +2635,7 @@ func (suite *HandlerSuite) TestReviewShipmentAddressUpdateHandler() {
 		suite.NoError(params.Body.Validate(strfmt.Default))
 
 		response := handler.Handle(params)
-		suite.IsType(shipmentops.ReviewShipmentAddressUpdateInternalServerError{}, response)
-		errResponse := response.(*shipmentops.ReviewShipmentAddressUpdateInternalServerError)
-
-		suite.NoError(errResponse.Payload.Validate(strfmt.Default))
+		suite.IsType(&shipmentops.ReviewShipmentAddressUpdateInternalServerError{}, response)
 	})
 }