diff --git a/api/cast/cast.pb.go b/api/cast/cast.pb.go index 68fde76..4445e97 100644 --- a/api/cast/cast.pb.go +++ b/api/cast/cast.pb.go @@ -3042,6 +3042,7 @@ func (x *MediaWorksResp) GetData() []*MediaWorksResp_Info { type PublishReq struct { state protoimpl.MessageState `protogen:"open.v1"` WorkUuids []string `protobuf:"bytes,1,rep,name=workUuids,proto3" json:"workUuids"` + Action string `protobuf:"bytes,2,opt,name=action,proto3" json:"action"` unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } @@ -3083,6 +3084,13 @@ func (x *PublishReq) GetWorkUuids() []string { return nil } +func (x *PublishReq) GetAction() string { + if x != nil { + return x.Action + } + return "" +} + type PublishResp struct { state protoimpl.MessageState `protogen:"open.v1"` Data []*PublishResp_Info `protobuf:"bytes,1,rep,name=data,proto3" json:"data"` @@ -3131,6 +3139,7 @@ type RePublishReq struct { state protoimpl.MessageState `protogen:"open.v1"` WorkUuids []string `protobuf:"bytes,1,rep,name=workUuids,proto3" json:"workUuids"` MediaAccountUuids []string `protobuf:"bytes,2,rep,name=mediaAccountUuids,proto3" json:"mediaAccountUuids"` + Action string `protobuf:"bytes,3,opt,name=action,proto3" json:"action"` unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } @@ -3179,6 +3188,13 @@ func (x *RePublishReq) GetMediaAccountUuids() []string { return nil } +func (x *RePublishReq) GetAction() string { + if x != nil { + return x.Action + } + return "" +} + type RePublishResp struct { state protoimpl.MessageState `protogen:"open.v1"` ArtistUuid string `protobuf:"bytes,1,opt,name=artistUuid,proto3" json:"artistUuid"` @@ -17272,20 +17288,22 @@ const file_pb_fiee_cast_proto_rawDesc = "" + "\x06images\x18\b \x03(\tR\x06images\x12\x1a\n" + "\bvideoUrl\x18\t \x01(\tR\bvideoUrl\x12\x1a\n" + "\bcoverUrl\x18\n" + - " \x01(\tR\bcoverUrl\"*\n" + + " \x01(\tR\bcoverUrl\"B\n" + "\n" + "PublishReq\x12\x1c\n" + - "\tworkUuids\x18\x01 \x03(\tR\tworkUuids\"\x85\x01\n" + + "\tworkUuids\x18\x01 \x03(\tR\tworkUuids\x12\x16\n" + + "\x06action\x18\x02 \x01(\tR\x06action\"\x85\x01\n" + "\vPublishResp\x12*\n" + "\x04data\x18\x01 \x03(\v2\x16.Cast.PublishResp.InfoR\x04data\x1aJ\n" + "\x04Info\x12\x1e\n" + "\n" + "artistUuid\x18\x01 \x01(\tR\n" + "artistUuid\x12\"\n" + - "\fworkCategory\x18\x02 \x01(\x05R\fworkCategory\"Z\n" + + "\fworkCategory\x18\x02 \x01(\x05R\fworkCategory\"r\n" + "\fRePublishReq\x12\x1c\n" + "\tworkUuids\x18\x01 \x03(\tR\tworkUuids\x12,\n" + - "\x11mediaAccountUuids\x18\x02 \x03(\tR\x11mediaAccountUuids\"M\n" + + "\x11mediaAccountUuids\x18\x02 \x03(\tR\x11mediaAccountUuids\x12\x16\n" + + "\x06action\x18\x03 \x01(\tR\x06action\"M\n" + "\rRePublishResp\x12\x1e\n" + "\n" + "artistUuid\x18\x01 \x01(\tR\n" + diff --git a/api/cast/cast.pb.validate.go b/api/cast/cast.pb.validate.go index 4a93b63..a7b0d74 100644 --- a/api/cast/cast.pb.validate.go +++ b/api/cast/cast.pb.validate.go @@ -3939,6 +3939,8 @@ func (m *PublishReq) validate(all bool) error { var errors []error + // no validation rules for Action + if len(errors) > 0 { return PublishReqMultiError(errors) } @@ -4171,6 +4173,8 @@ func (m *RePublishReq) validate(all bool) error { var errors []error + // no validation rules for Action + if len(errors) > 0 { return RePublishReqMultiError(errors) } diff --git a/pkg/service/cast/work.go b/pkg/service/cast/work.go index a8fc794..93b0691 100644 --- a/pkg/service/cast/work.go +++ b/pkg/service/cast/work.go @@ -434,6 +434,7 @@ func Publish(ctx *gin.Context) { return } newCtx := NewCtxWithUserInfo(ctx) + req.Action = "publishBatch1" if err = PublishWork(newCtx, req); err != nil { service.Error(ctx, err) return @@ -490,7 +491,7 @@ func PublishWork(ctx context.Context, req *cast.PublishReq) error { go func() { defer wg.Done() for workUuid := range jobs { - if err := PostAS(ctx, workUuid); err != nil { + if err := PostAS(ctx, workUuid, req.Action); err != nil { errsMu.Lock() errs = append(errs, err) errsMu.Unlock() @@ -529,9 +530,9 @@ func PublishWork(ctx context.Context, req *cast.PublishReq) error { return nil } -func PostAS(ctx context.Context, workUuid string) error { +func PostAS(ctx context.Context, workUuid, action string) error { var err error - _, err = service.CastProvider.Publish(ctx, &cast.PublishReq{WorkUuids: []string{workUuid}}) + _, err = service.CastProvider.Publish(ctx, &cast.PublishReq{WorkUuids: []string{workUuid}, Action: action}) if err != nil { zap.L().Error("Publish err", zap.String("workUuid", workUuid), zap.Error(err)) return err @@ -843,7 +844,7 @@ func RePublish(ctx *gin.Context) { return } fmt.Println(resp) - if err = PublishWork(newCtx, &cast.PublishReq{WorkUuids: resp.WorkUuids}); err != nil { + if err = PublishWork(newCtx, &cast.PublishReq{WorkUuids: resp.WorkUuids, Action: "publishBatch2"}); err != nil { service.Error(ctx, err) return }