Skip to content

Commit 6d725ca

Browse files
authored
Merge pull request #58 from ruwanego/refactor/standardize-loop-iteration-5247193987151900044
Refactor slice iteration to use traditional loops
2 parents 104bd84 + cdd62cb commit 6d725ca

6 files changed

Lines changed: 7 additions & 15 deletions

File tree

externals/repositories/SampleSQLRepository.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package repositories
33
import (
44
"context"
55
"fmt"
6-
"slices"
76

87
"github.com/storybuilder/storybuilder/domain/boundary/adapters"
98
"github.com/storybuilder/storybuilder/domain/boundary/repositories"
@@ -113,7 +112,7 @@ func (repo *SampleSQLRepository) mapResult(result []map[string]any) (samples []e
113112
err, _ = r.(error)
114113
}
115114
}()
116-
for row := range slices.Values(result) {
115+
for _, row := range result {
117116
samples = append(samples, entities.Sample{
118117
ID: int(row["id"].(int64)),
119118
Name: string(row["name"].([]byte)),

transport/http/error/formatter.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@ package error
33
import (
44
"encoding/json"
55
"errors"
6-
"strings"
7-
"slices"
86
"maps"
7+
"strings"
98

109
"github.com/iancoleman/strcase"
1110

@@ -115,7 +114,7 @@ func formatKey(k string) string {
115114
kParts := strings.Split(k, ".")
116115
// remove unpacker name
117116
kParts = kParts[1:]
118-
for i, part := range slices.All(kParts) {
117+
for i, part := range kParts {
119118
kParts[i] = strcase.ToSnake(part)
120119
}
121120
return strings.Join(kParts, ".")

transport/http/middleware/CORSMiddleware.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package middleware
22

33
import (
44
"net/http"
5-
"slices"
65
"strings"
76

87
"github.com/storybuilder/storybuilder/app/config"
@@ -28,7 +27,7 @@ func (m CORSMiddleware) Middleware(next http.Handler) http.Handler {
2827
if len(m.allowedOrigins) == 1 && m.allowedOrigins[0] == "*" {
2928
allowedOrigin = "*"
3029
} else {
31-
for o := range slices.Values(m.allowedOrigins) {
30+
for _, o := range m.allowedOrigins {
3231
if o == origin {
3332
allowedOrigin = origin
3433
break

transport/http/middleware/RequestCheckerMiddleware.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package middleware
33
import (
44
"fmt"
55
"net/http"
6-
"slices"
76
"strings"
87

98
"github.com/storybuilder/storybuilder/app/container"
@@ -29,7 +28,7 @@ func NewRequestCheckerMiddleware(ctr *container.Container) *RequestCheckerMiddle
2928
func (m *RequestCheckerMiddleware) Middleware(next http.Handler) http.Handler {
3029
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
3130
reqURL := r.URL.String()
32-
for v := range slices.Values(m.omittedRoutes) {
31+
for _, v := range m.omittedRoutes {
3332
if strings.HasPrefix(reqURL, v) {
3433
next.ServeHTTP(w, r)
3534
return

transport/http/response/transformer.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package response
22

33
import (
4-
"slices"
5-
64
"github.com/storybuilder/storybuilder/transport/http/response/mappers"
75
"github.com/storybuilder/storybuilder/transport/http/response/transformers"
86
)
@@ -17,7 +15,7 @@ func Transform(data any, t transformers.TransformerInterface, isCollection bool)
1715

1816
// Map wraps payload in a standard response payload object.
1917
func Map(data []any) (m mappers.Payload) {
20-
for v := range slices.Values(data) {
18+
for _, v := range data {
2119
switch v.(type) {
2220
default:
2321
m.Data = v

transport/http/response/transformers/SampleTransformer.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package transformers
22

33
import (
4-
"slices"
5-
64
"github.com/storybuilder/storybuilder/domain/entities"
75
"github.com/storybuilder/storybuilder/transport/http/errors"
86
)
@@ -40,7 +38,7 @@ func (t *SampleTransformer) TransformAsCollection(data any) (any, error) {
4038
if !ok {
4139
return nil, t.dataMismatchError()
4240
}
43-
for sample := range slices.Values(samples) {
41+
for _, sample := range samples {
4442
tr, err := t.TransformAsObject(sample)
4543
if err != nil {
4644
return nil, err

0 commit comments

Comments
 (0)