refactor(api/proto): optimize

modernice · Sep 24, 2022 · 4ef6cce · 4ef6cce
1 parent 8f1da76
commit 4ef6cce
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -5,4 +5,5 @@ generate:
 .PHONY: test
 test:
 	@go test -v ./...
+	@go test -v ./api/proto/...
 	@go test -v ./goes/esgallery/...
diff --git a/api/proto/gen/gallery/v0/gallery.go b/api/proto/gen/gallery/v0/gallery.go
@@ -38,16 +38,16 @@ func NewStack[StackID, ImageID gallery.ID](s gallery.Stack[StackID, ImageID]) *S
 	return &Stack{
 		Id:       s.ID.String(),
 		Variants: slicex.Map(s.Variants, NewVariant[ImageID]),
-		Tags:     slicex.Ensure(s.Tags),
+		Tags:     s.Tags,
 	}
 }
 
 func AsStack[StackID, ImageID gallery.ID](s *Stack, toStackID func(string) StackID, toImageID func(string) ImageID) gallery.Stack[StackID, ImageID] {
 	return gallery.Stack[StackID, ImageID]{
 		ID: toStackID(s.GetId()),
-		Variants: slicex.Map(s.GetVariants(), func(img *Image) gallery.Image[ImageID] {
+		Variants: slicex.Ensure(slicex.Map(s.GetVariants(), func(img *Image) gallery.Image[ImageID] {
 			return AsImage(img, toImageID)
-		}),
+		})),
 		Tags: slicex.Ensure(s.GetTags()),
 	}
 }