-
-
Notifications
You must be signed in to change notification settings - Fork 407
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #543 from OneArmyWorld/master
WIP backend refactor & v2 migration test
- Loading branch information
Showing
46 changed files
with
1,463 additions
and
825 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| // tslint:disable no-implicit-dependencies | ||
| // Models can be imported from the main package for use here | ||
| // NOTE 1 - this requires adjustment main src in package.json | ||
| // NOTE 2 - shorthand @OAModels notation defined in tsconfig | ||
| import { IDBEndpoint, IDbDoc } from '@OAModels/common.models' | ||
|
|
||
| export { IDBEndpoint, IDbDoc } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| import { db } from '../Firebase/firestoreDB' | ||
|
|
||
| /* Temporary function used to migrate from db V1 docs to V2 | ||
| The breaking change comes from converting timestamps to strings | ||
| (explained here: https://github.com/OneArmyWorld/onearmy/issues/343 ) | ||
| */ | ||
|
|
||
| const mappings: DBMapping = { | ||
| discussions: 'v2_discussions', | ||
| eventsV1: 'v2_events', | ||
| howtosV1: 'v2_howtos', | ||
| tagsV1: 'v2_tags', | ||
| users: 'v2_users', | ||
| } | ||
|
|
||
| export const upgradeDBAll = async () => { | ||
| const promises = Object.keys(mappings).map(async endpoint => { | ||
| const upgradedDocs = await upgradeDBEndpoint(endpoint) | ||
| return upgradedDocs | ||
| }) | ||
| const updates = await Promise.all(promises) | ||
| console.log('upgrade complete') | ||
| return updates | ||
| } | ||
|
|
||
| const upgradeDBEndpoint = async (endpoint: string) => { | ||
| console.log('upgrading endpoint', endpoint) | ||
| const snap = await db.collection(endpoint).get() | ||
| const docs = snap.empty ? [] : snap.docs.map(d => d.data()) | ||
| console.log(`|${endpoint}|: [${docs.length}] docs to upgrade`) | ||
| const batch = db.batch() | ||
| // remove deleted docs and upgrade | ||
| const v2Docs = docs.filter(d => !d._deleted).map(d => upgradeV1Doc(d)) | ||
| const v2Endpoint = mappings[endpoint] | ||
| v2Docs.forEach(v2Doc => { | ||
| const ref = db.doc(`${v2Endpoint}/${v2Doc._id}`) | ||
| batch.set(ref, v2Doc) | ||
| }) | ||
| console.log(`|${endpoint}|: upgrade ready`) | ||
| await batch.commit() | ||
| return v2Docs | ||
| } | ||
|
|
||
| function upgradeV1Doc(doc: any) { | ||
| try { | ||
| // upgrade timestamps on all docs | ||
| const metaFields = ['_created', '_modified'] | ||
| metaFields.forEach(field => { | ||
| doc[field] = _upgradeDate(doc[field]) | ||
| }) | ||
| // upgrade other specific fields | ||
| const optionalFields = ['_lastResponse', 'year', 'date'] | ||
| optionalFields.forEach(field => { | ||
| // ignore case where field set to null (discussions) | ||
| if (doc.hasOwnProperty(field) && doc[field]) { | ||
| doc[field] = _upgradeDate(doc[field]) | ||
| } | ||
| }) | ||
| return doc | ||
| } catch (error) { | ||
| console.log(doc) | ||
| throw new Error('unable to upgrade doc') | ||
| } | ||
| } | ||
|
|
||
| function _upgradeDate(date: any) { | ||
| if (typeof date === 'string') { | ||
| return new Date(date).toISOString() | ||
| } else if ( | ||
| date.hasOwnProperty('_seconds') && | ||
| date.hasOwnProperty('_nanoseconds') | ||
| ) { | ||
| const millis = date._seconds * 1000 + date._nanoseconds / 1e6 | ||
| return new Date(millis).toISOString() | ||
| } else { | ||
| throw new Error(`no date upgrade method: ${JSON.stringify(date)}`) | ||
| } | ||
| } | ||
|
|
||
| type DBMapping = { [key in IDBEndpointV1]: IDBEndpointV2 } | ||
|
|
||
| type IDBEndpointV1 = | ||
| | 'howtosV1' | ||
| | 'users' | ||
| | 'discussions' | ||
| | 'tagsV1' | ||
| | 'eventsV1' | ||
|
|
||
| type IDBEndpointV2 = | ||
| | 'v2_howtos' | ||
| | 'v2_users' | ||
| | 'v2_discussions' | ||
| | 'v2_tags' | ||
| | 'v2_events' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.