From ea6b8717b8ab124b144fe70ccb7d4472712c69c7 Mon Sep 17 00:00:00 2001
From: zijiren233 <pyh1670605849@gmail.com>
Date: Sun, 29 Oct 2023 22:54:22 +0800
Subject: [PATCH] Opt: vendor

---
 internal/model/movie.go  | 6 +++---
 internal/op/movie.go     | 2 +-
 server/handlers/movie.go | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/internal/model/movie.go b/internal/model/movie.go
index 65125a5..685cdac 100644
--- a/internal/model/movie.go
+++ b/internal/model/movie.go
@@ -36,9 +36,9 @@ type BaseMovie struct {
 }
 
 type VendorInfo struct {
-	Vendor             StreamingVendor    `json:"vendor"`
-	Shared             bool               `gorm:"not null;default:false" json:"shared"`
-	BilibiliVendorInfo BilibiliVendorInfo `gorm:"embedded;embeddedPrefix:bilibili_" json:"bilibiliVendorInfo,omitempty"`
+	Vendor   StreamingVendor    `json:"vendor"`
+	Shared   bool               `gorm:"not null;default:false" json:"shared"`
+	Bilibili BilibiliVendorInfo `gorm:"embedded;embeddedPrefix:bilibili_" json:"bilibili,omitempty"`
 }
 
 type BilibiliVendorInfo struct {
diff --git a/internal/op/movie.go b/internal/op/movie.go
index 8d2e814..040611d 100644
--- a/internal/op/movie.go
+++ b/internal/op/movie.go
@@ -153,7 +153,7 @@ func (m *movie) validateVendorMovie() error {
 	}
 	switch m.Base.VendorInfo.Vendor {
 	case model.StreamingVendorBilibili:
-		info := m.Base.VendorInfo.BilibiliVendorInfo
+		info := m.Base.VendorInfo.Bilibili
 		if info.Bvid == "" && info.Epid == 0 {
 			return fmt.Errorf("bvid and epid are empty")
 		}
diff --git a/server/handlers/movie.go b/server/handlers/movie.go
index 37de922..91adaf8 100644
--- a/server/handlers/movie.go
+++ b/server/handlers/movie.go
@@ -499,7 +499,7 @@ func parse2VendorMovie(userID string, movie *dbModel.Movie) (err error) {
 
 	switch movie.Base.VendorInfo.Vendor {
 	case dbModel.StreamingVendorBilibili:
-		info := movie.Base.VendorInfo.BilibiliVendorInfo
+		info := movie.Base.VendorInfo.Bilibili
 
 		vendor, err := db.AssignFirstOrCreateVendorByUserIDAndVendor(userID, dbModel.StreamingVendorBilibili)
 		if err != nil {