third/APIPark
1
0
Fork 0
mirror of https://github.com/APIParkLab/APIPark.git synced 2026-06-04 10:13:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

update publish problem

Browse Source
This commit is contained in:
Liujian
2024-12-06 16:12:49 +08:00
parent ef82cdbed6
commit c8ab65ef1b
2 changed files with 34 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/publish/iml.go
+1 -1
View File
@@ -200,7 +200,7 @@ func (m *imlPublishModule) getProjectRelease(ctx context.Context, projectID stri
var cfg interface{}
json.Unmarshal([]byte(s.Config), &cfg)
strategyReleases = append(strategyReleases, driver.ToRelease(&strategy_dto.Strategy{
Id: fmt.Sprintf("%s-%s", projectID, s.Id),
Id: fmt.Sprintf("%s", s.Id),
Name: s.Name,
Priority: s.Priority,
Filters: filters,
module/service-diff/iml.go
+33 -24
View File
@@ -195,26 +195,26 @@ func (m *imlServiceDiff) getReleaseInfo(ctx context.Context, releaseId string) (
if err != nil {
return nil, err
}
apiRequestCommitIds := utils.SliceToSlice(commits, func(i *release.ProjectCommits) string {
return i.Target
}, func(c *release.ProjectCommits) bool {
return c.Type == release.CommitApiRequest
})
apiProxyCommitIds := utils.SliceToSlice(commits, func(i *release.ProjectCommits) string {
return i.Commit
}, func(c *release.ProjectCommits) bool {
return c.Type == release.CommitApiProxy
})
apiDocumentCommitIds := utils.SliceToSlice(commits, func(i *release.ProjectCommits) string {
return i.Commit
}, func(c *release.ProjectCommits) bool {
return c.Type == release.CommitApiDocument
})
upstreamCommitIds := utils.SliceToSlice(commits, func(i *release.ProjectCommits) string {
return i.Commit
}, func(c *release.ProjectCommits) bool {
return c.Type == release.CommitUpstream
})
apiRequestCommitIds := make([]string, 0)
apiProxyCommitIds := make([]string, 0)
apiDocumentCommitIds := make([]string, 0)
upstreamCommitIds := make([]string, 0)
strategyCommitIds := make([]string, 0)
for _, c := range commits {
switch c.Type {
case release.CommitApiRequest:
apiRequestCommitIds = append(apiRequestCommitIds, c.Commit)
case release.CommitApiProxy:
apiProxyCommitIds = append(apiProxyCommitIds, c.Commit)
case release.CommitApiDocument:
apiDocumentCommitIds = append(apiDocumentCommitIds, c.Commit)
case release.CommitUpstream:
upstreamCommitIds = append(upstreamCommitIds, c.Commit)
case release.CommitStrategy:
strategyCommitIds = append(strategyCommitIds, c.Commit)
}
}
var requestCommits []*commit.Commit[api.Request]
var proxyCommits []*commit.Commit[api.Proxy]
var documentCommits []*commit.Commit[api_doc.DocCommit]
@@ -243,12 +243,20 @@ func (m *imlServiceDiff) getReleaseInfo(ctx context.Context, releaseId string) (
return nil, err
}
}
var strategyCommits []*commit.Commit[strategy.Commit]
if len(strategyCommitIds) > 0 {
strategyCommits, err = m.strategyService.ListStrategyCommit(ctx, strategyCommitIds...)
if err != nil {
return nil, err
}
}
return &projectInfo{
apiRequestCommits: requestCommits,
apiProxyCommits: proxyCommits,
apiDocCommits: documentCommits,
upstreamCommits: upstreamCommits,
strategyCommits: strategyCommits,
}, nil
}
@@ -261,19 +269,20 @@ func (m *imlServiceDiff) diffStrategies(base, target []*commit.Commit[strategy.C
})
out := make([]*service_diff.StrategyDiff, 0, len(target))
for _, tc := range targetStrategy {
//t := tc.Data
key := tc.Target
t := tc.Data
o := &service_diff.StrategyDiff{
Strategy: key,
Name: t.Name,
Priority: t.Priority,
Name: tc.Data.Name,
Priority: tc.Data.Priority,
Change: service_diff.ChangeTypeNone,
Status: 0,
}
b, hasB := baseStrategy[key]
if !hasB {
o.Change = service_diff.ChangeTypeNew
} else if b.UUID != tc.UUID {
} else if tc.Data.Version != b.Data.Version {
o.Change = service_diff.ChangeTypeUpdate
}
delete(baseStrategy, key)