Skip to content

Commit

Permalink
🎨 refactor the importer (#8473)
Browse files Browse the repository at this point in the history
refs #5422

- we can support null titles after this PR if we want
- user model: fix getAuthorRole
- user model: support adding roles by name
- we support this for roles as well, this makes it easier when importing related user roles (because usually roles already exists in the database and the related id's are wrong e.g. roles_users)
- base model: support for null created_at or updated_at values
- post or tag slugs are always safe strings
- enable an import of a null slug, no need to crash or to cover this on import layer
- add new DataImporter logic
    - uses a class inheritance mechanism to achieve an easier readability and maintenance
    - schema validation (happens on model layer) was ignored
    - allow to import unknown user id's (see #8365)
    - most of the duplication handling happens on model layer (we can use the power of unique fields and errors from the database)
- the import is splitted into three steps:
  - beforeImport
    --> prepares the data to import, sorts out relations (roles, tags), detects fields (for LTS)
  - doImport
    --> does the actual import
  - afterImport
    --> updates the data after successful import e.g. update all user reference fields e.g. published_by (compares the imported data with the current state of the database)
- import images: markdown can be null
- show error message when json handler can't parse file
- do not request gravatar if email is null
- return problems/warnings after successful import
- optimise warnings in importer
- do not return warnings for role duplications, no helpful information
- error handler: return context information of error
- we show the affected json entries as one line in the UI
- show warning for: detected duplicated tag
- schema validation: fix valueMustBeBoolean translation
- remove context property from json parse error
  • Loading branch information
kirrg001 authored and cobbspur committed May 23, 2017
1 parent 957f51e commit 1f37ff6
Show file tree
Hide file tree
Showing 29 changed files with 1,196 additions and 956 deletions.
5 changes: 4 additions & 1 deletion core/server/api/db.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,10 @@ db = {

function importContent(options) {
return importer.importFromFile(options)
.return({db: []});
.then(function (response) {
// NOTE: response can contain 2 objects if images are imported
return {db: [], problems: response.length === 2 ? response[1].problems : response[0].problems};
});
}

tasks = [
Expand Down
176 changes: 0 additions & 176 deletions core/server/data/import/data-importer.js

This file was deleted.

207 changes: 0 additions & 207 deletions core/server/data/import/index.js

This file was deleted.

Loading

0 comments on commit 1f37ff6

Please sign in to comment.