Making private import methos in the app layer (#13758)
* Making private import methos in the app layer * Making one more method private
Этот коммит содержится в:
коммит произвёл
Miguel de la Cruz
родитель
a76643116f
Коммит
ae6f15b76f
@@ -26,7 +26,7 @@ func stopOnError(err LineImportWorkerError) bool {
|
||||
|
||||
func (a *App) bulkImportWorker(dryRun bool, wg *sync.WaitGroup, lines <-chan LineImportWorkerData, errors chan<- LineImportWorkerError) {
|
||||
for line := range lines {
|
||||
if err := a.ImportLine(line.LineImportData, dryRun); err != nil {
|
||||
if err := a.importLine(line.LineImportData, dryRun); err != nil {
|
||||
errors <- LineImportWorkerError{err, line.LineNumber}
|
||||
}
|
||||
}
|
||||
@@ -134,48 +134,48 @@ func processImportDataFileVersionLine(line LineImportData) (int, *model.AppError
|
||||
return *line.Version, nil
|
||||
}
|
||||
|
||||
func (a *App) ImportLine(line LineImportData, dryRun bool) *model.AppError {
|
||||
func (a *App) importLine(line LineImportData, dryRun bool) *model.AppError {
|
||||
switch {
|
||||
case line.Type == "scheme":
|
||||
if line.Scheme == nil {
|
||||
return model.NewAppError("BulkImport", "app.import.import_line.null_scheme.error", nil, "", http.StatusBadRequest)
|
||||
}
|
||||
return a.ImportScheme(line.Scheme, dryRun)
|
||||
return a.importScheme(line.Scheme, dryRun)
|
||||
case line.Type == "team":
|
||||
if line.Team == nil {
|
||||
return model.NewAppError("BulkImport", "app.import.import_line.null_team.error", nil, "", http.StatusBadRequest)
|
||||
}
|
||||
return a.ImportTeam(line.Team, dryRun)
|
||||
return a.importTeam(line.Team, dryRun)
|
||||
case line.Type == "channel":
|
||||
if line.Channel == nil {
|
||||
return model.NewAppError("BulkImport", "app.import.import_line.null_channel.error", nil, "", http.StatusBadRequest)
|
||||
}
|
||||
return a.ImportChannel(line.Channel, dryRun)
|
||||
return a.importChannel(line.Channel, dryRun)
|
||||
case line.Type == "user":
|
||||
if line.User == nil {
|
||||
return model.NewAppError("BulkImport", "app.import.import_line.null_user.error", nil, "", http.StatusBadRequest)
|
||||
}
|
||||
return a.ImportUser(line.User, dryRun)
|
||||
return a.importUser(line.User, dryRun)
|
||||
case line.Type == "post":
|
||||
if line.Post == nil {
|
||||
return model.NewAppError("BulkImport", "app.import.import_line.null_post.error", nil, "", http.StatusBadRequest)
|
||||
}
|
||||
return a.ImportPost(line.Post, dryRun)
|
||||
return a.importPost(line.Post, dryRun)
|
||||
case line.Type == "direct_channel":
|
||||
if line.DirectChannel == nil {
|
||||
return model.NewAppError("BulkImport", "app.import.import_line.null_direct_channel.error", nil, "", http.StatusBadRequest)
|
||||
}
|
||||
return a.ImportDirectChannel(line.DirectChannel, dryRun)
|
||||
return a.importDirectChannel(line.DirectChannel, dryRun)
|
||||
case line.Type == "direct_post":
|
||||
if line.DirectPost == nil {
|
||||
return model.NewAppError("BulkImport", "app.import.import_line.null_direct_post.error", nil, "", http.StatusBadRequest)
|
||||
}
|
||||
return a.ImportDirectPost(line.DirectPost, dryRun)
|
||||
return a.importDirectPost(line.DirectPost, dryRun)
|
||||
case line.Type == "emoji":
|
||||
if line.Emoji == nil {
|
||||
return model.NewAppError("BulkImport", "app.import.import_line.null_emoji.error", nil, "", http.StatusBadRequest)
|
||||
}
|
||||
return a.ImportEmoji(line.Emoji, dryRun)
|
||||
return a.importEmoji(line.Emoji, dryRun)
|
||||
default:
|
||||
return model.NewAppError("BulkImport", "app.import.import_line.unknown_line_type.error", map[string]interface{}{"Type": line.Type}, "", http.StatusBadRequest)
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user