StampWithThumbnail修正

traPtitech · Oct 18, 2023 · 6fde0ca · 6fde0ca
1 parent 0c87c4a
commit 6fde0ca
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 15 deletions.
diff --git a/repository/gorm/stamp.go b/repository/gorm/stamp.go
@@ -367,13 +367,7 @@ func (r *stampRepository) StampThumbnailExists(stamps []*model.Stamp) (stampsWit
 	for _, s := range stamps {
 		_, ok := tm[s.FileID]
 		stampsWithThumb = append(stampsWithThumb, repository.StampWithThumbnail{
-			ID:           s.ID,
-			Name:         s.Name,
-			CreatorID:    s.CreatorID,
-			FileID:       s.FileID,
-			IsUnicode:    s.IsUnicode,
-			CreatedAt:    s.CreatedAt,
-			UpdatedAt:    s.UpdatedAt,
+			Stamp:        s,
 			HasThumbnail: ok,
 		})
 	}

diff --git a/repository/stamp.go b/repository/stamp.go
@@ -37,14 +37,8 @@ type StampStats struct {
 }
 
 type StampWithThumbnail struct {
-	ID           uuid.UUID `json:"id"`
-	Name         string    `json:"name"`
-	CreatorID    uuid.UUID `json:"creatorId"`
-	FileID       uuid.UUID `json:"fileId"`
-	IsUnicode    bool      `json:"isUnicode"`
-	CreatedAt    time.Time `json:"createdAt"`
-	UpdatedAt    time.Time `json:"updatedAt"`
-	HasThumbnail bool      `json:"hasThumbnail"`
+	*model.Stamp
+	HasThumbnail bool `json:"hasThumbnail"`
 }
 
 // StampType スタンプの種類