Improve nesting in NewID

calvinmclean · Aug 18, 2024 · a3bb457 · a3bb457
1 parent 06540c6
commit a3bb457
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/garden-app/server/id.go b/garden-app/server/id.go
@@ -27,14 +27,15 @@ var (
 // NewID creates a new unique xid by default, but mocking can be enabled to choose
 // from a consistent list of IDs so results are repeatable
 func NewID() babyapi.ID {
-	if enableMockIDs {
-		id, err := xid.FromString(ids[mockIDIndex])
-		if err != nil {
-			panic(err)
-		}
-		mockIDIndex++
+	if !enableMockIDs {
+		return babyapi.ID{ID: xid.NewWithTime(clock.Now())}
+	}
 
-		return babyapi.ID{ID: id}
+	id, err := xid.FromString(ids[mockIDIndex])
+	if err != nil {
+		panic(err)
 	}
-	return babyapi.ID{ID: xid.NewWithTime(clock.Now())}
+	mockIDIndex++
+
+	return babyapi.ID{ID: id}
 }