-
Notifications
You must be signed in to change notification settings - Fork 28
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat: save relative migrations path and add command to fix existing absolute paths #123
Open
jdachtera
wants to merge
5
commits into
mycodeself:master
Choose a base branch
from
jdachtera:relative_dir
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
69e83de
feat: save relative migrations path and add command to fix existing a…
jdachtera c38b594
fix: test
jdachtera 19de959
feat: add test for fixPaths command
jdachtera 3b7fdd4
fix: update packages to fix audit warnings
jdachtera dd6b1b3
Merge branch 'master' into relative_dir
jdachtera File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,83 @@ | ||
jest.mock('../lib/database'); | ||
jest.mock('../lib/migrations'); | ||
|
||
import { oraMock } from './__mocks__/ora.mock'; | ||
jest.mock('ora', () => { | ||
return jest.fn().mockImplementation(oraMock); | ||
}); | ||
|
||
import { MigrationModel, mongoConnect } from '../lib/database'; | ||
import { configMock } from './__mocks__/config.mock'; | ||
import { connectionMock } from './__mocks__/connection.mock'; | ||
import { fixPaths } from '../lib/commands/fixPaths'; | ||
|
||
describe('fixPaths command', () => { | ||
const numberOfMigrations = 10; | ||
const fakeMigrations: MigrationModel[] = Array(numberOfMigrations) | ||
.fill(undefined) | ||
.map((v: MigrationModel, index: number) => ({ | ||
_id: `${index}`, | ||
className: `MigrationTest${index}`, | ||
file: `${ | ||
index % 3 === 0 ? '/home/runner/migrations/' : '/home/user/project/' | ||
}MigrationTest${index}.ts`, | ||
timestamp: +new Date(), | ||
})); | ||
|
||
(mongoConnect as jest.Mock).mockReturnValue( | ||
new Promise((resolve) => resolve(connectionMock)) | ||
); | ||
|
||
const createMockCursor = () => { | ||
let i = 0; | ||
return { | ||
hasNext: () => i < fakeMigrations.length, | ||
next: () => { | ||
const item = fakeMigrations[i]; | ||
i += 1; | ||
return item ?? null; | ||
}, | ||
}; | ||
}; | ||
|
||
const mockUpdateOne = jest.fn(); | ||
|
||
beforeEach(() => { | ||
(connectionMock.client.close as jest.Mock).mockReset(); | ||
connectionMock.getMigrationsCollection.mockReset(); | ||
mockUpdateOne.mockReset(); | ||
|
||
connectionMock.getMigrationsCollection.mockReturnValue({ | ||
updateOne: mockUpdateOne, | ||
find: jest.fn().mockImplementation(createMockCursor), | ||
}); | ||
}); | ||
|
||
it('should convert absolute paths only of matching migrations', async () => { | ||
const basePath = '/home/runner/migrations'; | ||
await fixPaths({ config: configMock, basePath }); | ||
|
||
fakeMigrations.forEach((fakeMigration, index) => { | ||
(fakeMigration.file.startsWith(basePath) | ||
? expect(mockUpdateOne) | ||
: expect(mockUpdateOne).not | ||
).toHaveBeenCalledWith( | ||
{ _id: `${index}` }, | ||
{ $set: { file: `MigrationTest${index}.ts` } } | ||
); | ||
}); | ||
|
||
expect(connectionMock.client.close).toBeCalled(); | ||
}); | ||
|
||
it('should not alter the database in dry run mode', async () => { | ||
await fixPaths({ | ||
config: configMock, | ||
dryRun: true, | ||
basePath: '/home/runner/migrations', | ||
}); | ||
|
||
expect(mockUpdateOne).not.toHaveBeenCalled(); | ||
expect(connectionMock.client.close).toBeCalled(); | ||
}); | ||
}); |
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,53 @@ | ||
import * as path from 'path'; | ||
import { Config, processConfig } from '../config'; | ||
import { mongoConnect } from '../database'; | ||
|
||
interface CommandFixPathsOptions { | ||
config: Config; | ||
basePath?: string; | ||
dryRun?: boolean; | ||
} | ||
|
||
export const fixPaths = async ({ | ||
basePath, | ||
config, | ||
dryRun, | ||
}: CommandFixPathsOptions): Promise<void> => { | ||
const { uri, database, options, migrationsCollection, migrationsDir } = | ||
processConfig(config); | ||
const connection = await mongoConnect(uri, database, options); | ||
const collection = connection.getMigrationsCollection(migrationsCollection); | ||
|
||
const basePathWithMigrationsDirDefault = | ||
basePath ?? path.resolve(migrationsDir); | ||
|
||
|
||
try { | ||
const cursor = collection.find({ | ||
file: new RegExp(`^${basePathWithMigrationsDirDefault}.*`), | ||
}); | ||
|
||
while (await cursor.hasNext()) { | ||
const migration = await cursor.next(); | ||
if (!migration) break; | ||
|
||
const newFilePath = path.relative( | ||
basePathWithMigrationsDirDefault, | ||
migration.file | ||
); | ||
|
||
console.log( | ||
`Updating migration path "${migration.file}" to "${newFilePath}"` | ||
); | ||
|
||
if (!dryRun) { | ||
await collection.updateOne( | ||
{ _id: migration._id }, | ||
{ $set: { file: newFilePath } } | ||
); | ||
} | ||
} | ||
} finally { | ||
await connection.client.close(); | ||
} | ||
}; |
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.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this change came from the actual output of running the command