Revert "StampWithThumbnail修正"

This reverts commit 6fde0ca.
traPtitech · Nov 27, 2023 · d2b5d5c · d2b5d5c
1 parent 5cff7cb
commit d2b5d5c
Show file tree

Hide file tree

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

diff --git a/repository/stamp.go b/repository/stamp.go
@@ -37,8 +37,14 @@ type StampStats struct {
 }
 
 type StampWithThumbnail struct {
-	*model.Stamp
-	HasThumbnail bool `json:"hasThumbnail"`
+	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"`
 }
 
 // StampType スタンプの種類