fix: solve multi-instance problems and compatible with old data (#3399)

Author: littlejiancc

modules/dop/dao/issue.go

@@ -1045,8 +1045,17 @@ func (client *DBClient) FindIssueChildrenTimeRange(id uint64) (*time.Time, *time
 	return res.Min, res.Max, nil
 }
 
-func (client *DBClient) ListIssueForIssueStateTransMigration() ([]Issue, error) {
-	var issues []Issue
-	err := client.Model(&Issue{}).Where("deleted = 0").Find(&issues).Error
+// IssueForIssueStateTransMigration the type of state is string
+type IssueForIssueStateTransMigration struct {
+	dbengine.BaseModel
+
+	ProjectID uint64
+	Type      apistructs.IssueType
+	Creator   string
+}
+
+func (client *DBClient) ListIssueForIssueStateTransMigration() ([]IssueForIssueStateTransMigration, error) {
+	var issues []IssueForIssueStateTransMigration
+	err := client.Table("dice_issues").Where("deleted = 0").Find(&issues).Error
 	return issues, err
 }

modules/dop/initialize.go

@@ -241,15 +241,19 @@ func (p *provider) Initialize(ctx servicehub.Context) error {
 			return
 		}
 		if len(resp.Kvs) == 0 {
+			_, err = p.EtcdClient.Put(context.Background(), EtcdIssueStateCompensate, "true")
+			if err != nil {
+				logrus.Error(err)
+			}
 			logrus.Infof("start compensate issue state transition")
 			if err = compensateIssueStateCirculation(ep); err != nil {
 				logrus.Error(err)
+				_, err = p.EtcdClient.Delete(context.Background(), EtcdIssueStateCompensate)
+				if err != nil {
+					logrus.Error(err)
+				}
 				return
 			}
-			_, err = p.EtcdClient.Put(context.Background(), EtcdIssueStateCompensate, "true")
-			if err != nil {
-				logrus.Error(err)
-			}
 		}
 	}()