Add swapAndHandleBatch func; fix unit test

Author: Kate Osborn

internal/events/events_test.go

@@ -10,7 +10,7 @@ import (
 func TestEventLoop_SwapBatches(t *testing.T) {
 	eventLoop := NewEventLoop(nil, zap.New(), nil, nil)
 
-	eventLoop.currentBatch = []interface{}{
+	eventLoop.currentBatch = EventBatch{
 		"event0",
 		"event1",
 		"event2",

internal/events/loop.go

@@ -71,6 +71,12 @@ func (el *EventLoop) Start(ctx context.Context) error {
 		}(el.currentBatch)
 	}
 
+	swapAndHandleBatch := func() {
+		el.swapBatches()
+		handleBatch()
+		handling = true
+	}
+
 	// Prepare the fist event batch, which includes the UpsertEvents for all relevant cluster resources.
 	// This is necessary so that the first time the EventHandler generates NGINX configuration, it derives it from
 	// a complete view of the cluster. Otherwise, the handler would generate incomplete configuration, which can lead
@@ -116,20 +122,14 @@ func (el *EventLoop) Start(ctx context.Context) error {
 
 			// If no batch is currently being handled, swap batches and begin handling the batch.
 			if !handling {
-				el.swapBatches()
-
-				handleBatch()
-				handling = true
+				swapAndHandleBatch()
 			}
 		case <-handlingDone:
 			handling = false
 
 			// If there's at least one event in the next batch, swap batches and begin handling the batch.
 			if len(el.nextBatch) > 0 {
-				el.swapBatches()
-
-				handleBatch()
-				handling = true
+				swapAndHandleBatch()
 			}
 		}
 	}