Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion api/v1/hammer.swagger.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"paths": {
"/v1/deliveries": {
"get": {
"summary": "List deliveires",
"summary": "List deliveries",
"operationId": "Hammer_ListDeliveries",
"responses": {
"200": {
Expand Down
2 changes: 1 addition & 1 deletion cmd/hammer/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ func main() {
{
Name: "migrate",
Aliases: []string{"m"},
Usage: "Run dabatase migrate",
Usage: "Run database migrate",
Action: func(c *cli.Context) error {
err := ac.migrationService.Run()
if err != nil {
Expand Down
4 changes: 2 additions & 2 deletions grpc/delivery_handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,15 +66,15 @@ func (d *DeliveryHandler) GetDelivery(ctx context.Context, request *pb.GetDelive
return d.buildResponse(&delivery)
}

// ListDeliveries get a list of deliveryies
// ListDeliveries get a list of deliveries
func (d *DeliveryHandler) ListDeliveries(ctx context.Context, request *pb.ListDeliveriesRequest) (*pb.ListDeliveriesResponse, error) {
// Get limit and offset
limit, offset := parsePagination(request.Limit, request.Offset)

// Create response
response := &pb.ListDeliveriesResponse{}

// Get Deliverys
// Get Delivery
findOptions := hammer.FindOptions{
FindPagination: &hammer.FindPagination{
Limit: limit,
Expand Down
12 changes: 6 additions & 6 deletions service/delivery_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,10 @@ func TestDelivery(t *testing.T) {
deliveryRepo.On("Store", mock.Anything, mock.Anything).Return(nil)
txRepo.On("Commit").Return(nil)

deliveryAttemps := delivery.DeliveryAttempts
deliveryAttempts := delivery.DeliveryAttempts
deliveryAttempt, err := deliveryService.Dispatch(&delivery, httpServer.Client())
assert.Nil(t, err)
assert.Equal(t, delivery.DeliveryAttempts, deliveryAttemps+1)
assert.Equal(t, delivery.DeliveryAttempts, deliveryAttempts+1)
assert.Equal(t, hammer.DeliveryStatusCompleted, delivery.Status)
assert.Equal(t, true, deliveryAttempt.Success)
assert.Equal(t, http.StatusOK, deliveryAttempt.ResponseStatusCode)
Expand All @@ -102,10 +102,10 @@ func TestDelivery(t *testing.T) {
txRepo.On("Commit").Return(nil)

deliveryScheduledAt := delivery.ScheduledAt
deliveryAttemps := delivery.DeliveryAttempts
deliveryAttempts := delivery.DeliveryAttempts
deliveryAttempt, err := deliveryService.Dispatch(&delivery, httpServer.Client())
assert.Nil(t, err)
assert.Equal(t, delivery.DeliveryAttempts, deliveryAttemps+1)
assert.Equal(t, delivery.DeliveryAttempts, deliveryAttempts+1)
assert.Equal(t, hammer.DeliveryStatusPending, delivery.Status)
assert.True(t, delivery.ScheduledAt.After(deliveryScheduledAt))
assert.Equal(t, false, deliveryAttempt.Success)
Expand All @@ -131,10 +131,10 @@ func TestDelivery(t *testing.T) {
txRepo.On("Commit").Return(nil)

deliveryScheduledAt := delivery.ScheduledAt
deliveryAttemps := delivery.DeliveryAttempts
deliveryAttempts := delivery.DeliveryAttempts
deliveryAttempt, err := deliveryService.Dispatch(&delivery, httpServer.Client())
assert.Nil(t, err)
assert.Equal(t, delivery.DeliveryAttempts, deliveryAttemps+1)
assert.Equal(t, delivery.DeliveryAttempts, deliveryAttempts+1)
assert.Equal(t, hammer.DeliveryStatusFailed, delivery.Status)
assert.Equal(t, deliveryScheduledAt, delivery.ScheduledAt)
assert.Equal(t, false, deliveryAttempt.Success)
Expand Down