[API] Migration: Change ServiceType String #12672

6543 · 2020-09-01T10:43:43Z

codecov-commenter · 2020-09-01T11:11:23Z

Codecov Report

Merging #12672 into master will decrease coverage by 0.03%.
The diff coverage is 53.70%.

@@            Coverage Diff             @@
##           master   #12672      +/-   ##
==========================================
- Coverage   43.22%   43.19%   -0.04%     
==========================================
  Files         651      651              
  Lines       72118    72134      +16     
==========================================
- Hits        31175    31156      -19     
- Misses      35898    35931      +33     
- Partials     5045     5047       +2

Impacted Files	Coverage Δ
modules/structs/repo.go	`50.00% <ø> (ø)`
modules/convert/utils.go	`44.44% <33.33%> (-22.23%)`	⬇️
modules/auth/repo_form.go	`42.34% <50.00%> (ø)`
routers/repo/migrate.go	`44.82% <50.00%> (ø)`
routers/api/v1/repo/migrate.go	`43.60% <53.33%> (-2.13%)`	⬇️
models/task.go	`40.21% <100.00%> (ø)`
modules/migrations/gitea.go	`6.70% <100.00%> (-0.38%)`	⬇️
modules/repository/repo.go	`42.58% <100.00%> (ø)`
modules/task/migrate.go	`25.80% <100.00%> (ø)`
routers/api/v1/api.go	`79.08% <100.00%> (ø)`
... and 17 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update daefdd1...be8bd63. Read the comment docs.

templates/swagger/v1_json.tmpl

6543 · 2020-09-01T13:54:32Z

@lunny I think I should fix this upstream ... at the moment eaven a between , break things :/

-> Resolved

web_src/js/features/migration.js

techknowlogick

Testing this PR, when I toggle mirror checkbox it should disable option to migrate issues,PRs, etc..

templates/repo/migrate.tmpl

6543 · 2020-09-01T20:36:49Z

@jolheiser I'll test it again - hope it still works...

6543 · 2020-09-01T20:47:09Z

@jolheiser no it broke "pre selection" to Git

gitea/routers/repo/repo.go

Line 272 in 3270e7a

ctx.Data["service"] = structs.PlainGitService

☝️ yes it is no struct but this type has a type-function called Title()

jolheiser · 2020-09-01T21:13:31Z

I see, my bad. But now I have another concern.

This PR doesn't actually change the enums to strings, it just provides a way to convert strings into a GitServiceType.

I'm a little worried that this adds unneeded complexity, is it not possible to change the enum to a string, or perhaps just a wrapper for the API?

6543 · 2020-09-01T21:28:17Z

yes it is doable - will resullt in dublicating the struct ...

6543 · 2020-09-01T22:43:11Z

@jolheiser Done

6543 · 2020-09-01T23:14:55Z

I included the refactor because I think it is realy needed in this pull ...

Refactor:

the Options for WebUI: modules/auth/repo_form.go
the Options for API: modules/structs/repo.go
the option struct after validation & supplementing for internal prossessing: modules/migrations/base/options.go

modules/convert/utils.go

6543 · 2020-09-02T05:15:14Z

@techknowlogick If this is all you can find then I'm totaly fine with it 🙃

lunny · 2020-09-10T04:54:46Z

Please resolve the conflicts.

6543 · 2020-09-10T07:48:35Z

@lunny done

modules/migrations/base/options.go

6543 · 2020-09-10T20:55:40Z

@zeripath added doc what purpose each struct has

@techknowlogick can you either dismiss review or have a look at it?

dismiss my review

6543 · 2020-09-10T21:19:03Z

thanks @ techknowlogick

6543 · 2020-09-10T23:16:54Z

@zeripath thanks :)

fix #13085 Backport #12862 Backport Parts of #12672

GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Sep 1, 2020

lunny reviewed Sep 1, 2020

View reviewed changes

templates/swagger/v1_json.tmpl Outdated Show resolved Hide resolved

6543 force-pushed the api-migration-serviceType-string branch from 1cd9dd5 to 6f46bc2 Compare September 1, 2020 13:53

6543 mentioned this pull request Sep 1, 2020

model enum recognizion and handling spaces go-swagger/go-swagger#2396

Open

lafriks reviewed Sep 1, 2020

View reviewed changes

web_src/js/features/migration.js Outdated Show resolved Hide resolved

techknowlogick previously requested changes Sep 1, 2020

View reviewed changes

jolheiser reviewed Sep 1, 2020

View reviewed changes

templates/repo/migrate.tmpl Outdated Show resolved Hide resolved

6543 force-pushed the api-migration-serviceType-string branch from a935a4c to 0427ebf Compare September 1, 2020 20:43

6543 changed the title ~~Migration Service Type: change to string enum~~ Migration Service Type: change to string enum for API Sep 1, 2020

6543 changed the title ~~Migration Service Type: change to string enum for API~~ Migration Service Type: change to string enum for API/Form Sep 1, 2020

6543 changed the title ~~Migration Service Type: change to string enum for API/Form~~ WIP: Migration Service Type: change to string enum for API Sep 1, 2020

6543 force-pushed the api-migration-serviceType-string branch from 0427ebf to b7ea054 Compare September 1, 2020 22:07

6543 changed the title ~~WIP: Migration Service Type: change to string enum for API~~ Migration Service Type: change to string enum for API Sep 1, 2020

6543 changed the title ~~Migration Service Type: change to string enum for API~~ [API] Migration: Change ServiceType String Sep 1, 2020

6543 requested a review from techknowlogick September 1, 2020 22:44

techknowlogick reviewed Sep 2, 2020

View reviewed changes

modules/convert/utils.go Outdated Show resolved Hide resolved

6543 requested a review from techknowlogick September 3, 2020 01:29

6543 added this to the 1.13.0 milestone Sep 4, 2020

6543 added modifies/api This PR adds API routes or modifies them type/refactoring Existing code has been cleaned up. There should be no new functionality. labels Sep 4, 2020

use different structs for MigrateRepoOptions on UI and API

5923384

6543 added 6 commits September 7, 2020 17:15

Merge branch 'master' into api-migration-serviceType-string

b7c4c9f

Merge branch 'master' into api-migration-serviceType-string

6aa16ae

Merge branch 'master' into api-migration-serviceType-string

add56a5

Merge branch 'master' into api-migration-serviceType-string

45c2d6c

Merge branch 'master' into api-migration-serviceType-string

31777bf

Merge branch 'master' into api-migration-serviceType-string

200ead5

6543 added 2 commits September 10, 2020 09:42

Merge branch 'master' into api-migration-serviceType-string

66a92ac

adopt repo.go -> migrate.go

0e70614

lafriks approved these changes Sep 10, 2020

View reviewed changes

GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Sep 10, 2020

zeripath reviewed Sep 10, 2020

View reviewed changes

modules/migrations/base/options.go Show resolved Hide resolved

zeripath approved these changes Sep 10, 2020

View reviewed changes

GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Sep 10, 2020

6543 added 2 commits September 10, 2020 22:45

Merge branch 'master' into api-migration-serviceType-string

016c326

add comment about each struct purpose

6e68fb1

6543 and others added 2 commits September 10, 2020 23:20

lint

02ffa90

Merge branch 'master' into api-migration-serviceType-string

be8bd63

zeripath merged commit fd60ebf into go-gitea:master Sep 10, 2020

6543 deleted the api-migration-serviceType-string branch September 10, 2020 23:16

6543 mentioned this pull request Oct 11, 2020

Backport Migration Option AuthToken #13101

Merged

zeripath pushed a commit that referenced this pull request Oct 12, 2020

Backport Migration Option AuthToken (#13101)

f9942ad

fix #13085 Backport #12862 Backport Parts of #12672

go-gitea locked and limited conversation to collaborators Nov 24, 2020

Uh oh!

[API] Migration: Change ServiceType String #12672

[API] Migration: Change ServiceType String #12672

Uh oh!

Conversation

6543 commented Sep 1, 2020

Uh oh!

codecov-commenter commented Sep 1, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

6543 commented Sep 1, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

techknowlogick left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

6543 commented Sep 1, 2020

Uh oh!

6543 commented Sep 1, 2020

Uh oh!

jolheiser commented Sep 1, 2020

Uh oh!

6543 commented Sep 1, 2020

Uh oh!

6543 commented Sep 1, 2020

Uh oh!

6543 commented Sep 1, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Refactor:

Uh oh!

Uh oh!

6543 commented Sep 2, 2020

Uh oh!

lunny commented Sep 10, 2020

Uh oh!

6543 commented Sep 10, 2020

Uh oh!

Uh oh!

6543 commented Sep 10, 2020

Uh oh!

6543 commented Sep 10, 2020

Uh oh!

6543 commented Sep 10, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

codecov-commenter commented Sep 1, 2020 •

edited

Loading

6543 commented Sep 1, 2020 •

edited

Loading

6543 commented Sep 1, 2020 •

edited

Loading