From bb86d4806fc2a38a9770ba26396ca26c65475312 Mon Sep 17 00:00:00 2001 From: KevinMidboe Date: Sun, 3 Mar 2019 20:21:41 +0100 Subject: [PATCH] Updated seeders for images and migration for adding folder column to images --- .../migrations/20190223148284-createImage.js | 12 +++++- .../20190223148294-createLocation.js | 8 ++++ ...190303190829-addImageColumnParentFolder.js | 18 +++++++++ src/db/seeders/20190217211559-images.js | 37 ++++++++++--------- .../seeders/20190217221016-imagevariations.js | 18 --------- 5 files changed, 55 insertions(+), 38 deletions(-) create mode 100644 src/db/migrations/20190303190829-addImageColumnParentFolder.js delete mode 100644 src/db/seeders/20190217221016-imagevariations.js diff --git a/src/db/migrations/20190223148284-createImage.js b/src/db/migrations/20190223148284-createImage.js index 22e83ee..c908ac5 100644 --- a/src/db/migrations/20190223148284-createImage.js +++ b/src/db/migrations/20190223148284-createImage.js @@ -20,13 +20,21 @@ module.exports = { type: Sequelize.TEXT, allowNull: true }, - size: { - type: Sequelize.DOUBLE, + variations: { + type: Sequelize.JSON, allowNull: true }, album_order: { type: Sequelize.INTEGER, allowNull: true + }, + createdAt: { + allowNull: false, + type: Sequelize.DATE + }, + updatedAt: { + allowNull: false, + type: Sequelize.DATE } } ) diff --git a/src/db/migrations/20190223148294-createLocation.js b/src/db/migrations/20190223148294-createLocation.js index cd37786..7dee8a1 100644 --- a/src/db/migrations/20190223148294-createLocation.js +++ b/src/db/migrations/20190223148294-createLocation.js @@ -22,6 +22,14 @@ module.exports = { type: Sequelize.JSON, allowNull: true, defaultValue: null + }, + createdAt: { + allowNull: false, + type: Sequelize.DATE + }, + updatedAt: { + allowNull: false, + type: Sequelize.DATE } } ) diff --git a/src/db/migrations/20190303190829-addImageColumnParentFolder.js b/src/db/migrations/20190303190829-addImageColumnParentFolder.js new file mode 100644 index 0000000..bd63754 --- /dev/null +++ b/src/db/migrations/20190303190829-addImageColumnParentFolder.js @@ -0,0 +1,18 @@ +'use strict'; + +module.exports = { + up: (queryInterface, Sequelize) => { + return queryInterface.addColumn( + 'images', + 'folder', + { + type: Sequelize.STRING, + allowNull: false + } + ) + }, + + down: (queryInterface, Sequelize) => { + return queryInterface.removeColumn('images', 'folder') + } +}; diff --git a/src/db/seeders/20190217211559-images.js b/src/db/seeders/20190217211559-images.js index e6059b6..2e72483 100644 --- a/src/db/seeders/20190217211559-images.js +++ b/src/db/seeders/20190217211559-images.js @@ -3,47 +3,48 @@ module.exports = { up: (queryInterface, Sequelize) => { return queryInterface.bulkInsert('images', [{ - filename: 'DSC_9029.png', + filename: '686f90d2dae64d979d5c2df0a866d286.jpg', adventure_id: 1, - size: 2983546, + // size: 2983546, + album_order: 0, + variations: '{"sizes":["thumb","sm","md","lg"]}', + folder: '/Users/kevinmidboe/python/leifs-image-processor/assets', createdAt: new Date(), updatedAt: new Date() }, { - filename: 'DSC_0505.png', + filename: '41baeb62842d4b99a71ba6cdabf09e7c.jpg', adventure_id: 1, description: 'Dancing around the christmas tree', - size: 10032272, + // size: 10032272, album_order: 1, + variations: '{"sizes":["thumb","sm","md","lg"]}', + folder: '/Users/kevinmidboe/python/leifs-image-processor/assets', createdAt: new Date(), updatedAt: new Date() }, { - filename: 'DSC_0509.png', + filename: '5de304186ef4439e814c5eca3fe03a4c.jpg', adventure_id: 2, description: 'Se på den fisken der!', - size: 8032272, - album_order: 2, + // size: 8032272, + album_order: 1, + variations: '{"sizes":["thumb","sm","md","lg"]}', + folder: '/Users/kevinmidboe/python/leifs-image-processor/assets', createdAt: new Date(), updatedAt: new Date() }, { - filename: 'DSC_0510.png', + filename: '42531f99132e414a81d6d21d97e77082.jpg', adventure_id: 2, description: 'Noe i garnet!', - size: 6373234, - album_order: 1, + // size: 6373234, + album_order: 0, + variations: '{"sizes":["thumb","sm","md","lg"]}', + folder: '/Users/kevinmidboe/python/leifs-image-processor/assets', createdAt: new Date(), updatedAt: new Date() }], {}) - - // const adventure = await queryInterface.Sequelize.query( - // `SELECT id FROM adventure;` - // ); - - // const adventure = images[0]; - - // return await queryInterface.bulkInsert('images') }, down: (queryInterface, Sequelize) => { diff --git a/src/db/seeders/20190217221016-imagevariations.js b/src/db/seeders/20190217221016-imagevariations.js deleted file mode 100644 index 700933e..0000000 --- a/src/db/seeders/20190217221016-imagevariations.js +++ /dev/null @@ -1,18 +0,0 @@ -'use strict'; - -module.exports = { - up: (queryInterface, Sequelize) => { - return queryInterface.bulkInsert('imagevariations', [{ - 'image_id': 4, - 'thumb': false, - 'md': true, - 'lg': true, - createdAt: new Date(), - updatedAt: new Date() - }]) - }, - - down: (queryInterface, Sequelize) => { - return queryInterface.bulkDelete('imagevariations', null, {}); - } -};