-
-
Notifications
You must be signed in to change notification settings - Fork 6.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: allow soft-deletion of orphaned relation rows using orphanedRow… (
#8414) * feat: Allow soft-deletion of orphaned relation rows using orphanedRowAction * add deletedate column * fix: create docs * improve the tests * remove .only in the tests file Co-authored-by: oxeye-yuvalk <oxeye-yuvalk@oxeye.io>
- Loading branch information
1 parent
2834729
commit cefddd9
Showing
8 changed files
with
128 additions
and
5 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
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,75 @@ | ||
import "reflect-metadata"; | ||
import { Connection, Repository } from "../../../src/index"; | ||
import { reloadTestingDatabases, createTestingConnections, closeTestingConnections } from "../../utils/test-utils"; | ||
import { expect } from "chai"; | ||
import { Category } from "./entity/Category"; | ||
import { Post } from "./entity/Post"; | ||
|
||
describe("persistence > delete orphans", () => { | ||
|
||
// ------------------------------------------------------------------------- | ||
// Configuration | ||
// ------------------------------------------------------------------------- | ||
|
||
// connect to db | ||
let connections: Connection[] = []; | ||
|
||
before(async () => connections = await createTestingConnections({ | ||
entities: [__dirname + "/entity/*{.js,.ts}"], | ||
|
||
})); | ||
beforeEach(() => reloadTestingDatabases(connections)); | ||
after(() => closeTestingConnections(connections)); | ||
|
||
// ------------------------------------------------------------------------- | ||
// Specifications | ||
// ------------------------------------------------------------------------- | ||
|
||
describe("when a Post is removed from a Category", () => { | ||
let categoryRepository: Repository<Category>; | ||
let postRepository: Repository<Post>; | ||
let categoryId: number; | ||
|
||
beforeEach(async () => { | ||
await Promise.all(connections.map(async connection => { | ||
categoryRepository = connection.getRepository(Category); | ||
postRepository = connection.getRepository(Post); | ||
})); | ||
|
||
const categoryToInsert = await categoryRepository.save(new Category()); | ||
categoryToInsert.posts = [ | ||
new Post(), | ||
new Post() | ||
]; | ||
|
||
await categoryRepository.save(categoryToInsert); | ||
categoryId = categoryToInsert.id; | ||
|
||
const categoryToUpdate = (await categoryRepository.findOne(categoryId))!; | ||
categoryToUpdate.posts = categoryToInsert.posts.filter(p => p.id === 1); // Keep the first post | ||
|
||
await categoryRepository.save(categoryToUpdate); | ||
}); | ||
|
||
it("should retain a Post on the Category", async () => { | ||
const category = await categoryRepository.findOne(categoryId); | ||
expect(category).not.to.be.undefined; | ||
expect(category!.posts).to.have.lengthOf(1); | ||
expect(category!.posts[0].id).to.equal(1); | ||
}); | ||
|
||
it("should mark orphaned Post as soft-deleted", async () => { | ||
const postCount = await postRepository.count(); | ||
expect(postCount).to.equal(1); | ||
const postCountIncludeDeleted = await postRepository.count({withDeleted: true}); | ||
expect(postCountIncludeDeleted).to.equal(2); | ||
}); | ||
|
||
it("should retain foreign keys on remaining Posts", async () => { | ||
const postsWithoutForeignKeys = (await postRepository.find()) | ||
.filter(p => !p.categoryId); | ||
expect(postsWithoutForeignKeys).to.have.lengthOf(0); | ||
}); | ||
}); | ||
|
||
}); |
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,21 @@ | ||
import {Entity} from "../../../../src/decorator/entity/Entity"; | ||
import {PrimaryGeneratedColumn} from "../../../../src/decorator/columns/PrimaryGeneratedColumn"; | ||
import {Post} from "./Post"; | ||
import {OneToMany} from "../../../../src/decorator/relations/OneToMany"; | ||
import {DeleteDateColumn} from "../../../../src"; | ||
|
||
@Entity() | ||
export class Category { | ||
|
||
@PrimaryGeneratedColumn() | ||
id: number; | ||
|
||
@OneToMany(() => Post, post => post.category, { | ||
cascade: true, | ||
eager: true | ||
}) | ||
posts: Post[]; | ||
|
||
@DeleteDateColumn() | ||
deletedAt?: Date; | ||
} |
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,24 @@ | ||
import {Category} from "./Category"; | ||
import {Entity} from "../../../../src/decorator/entity/Entity"; | ||
import {PrimaryGeneratedColumn} from "../../../../src/decorator/columns/PrimaryGeneratedColumn"; | ||
import {Column} from "../../../../src/decorator/columns/Column"; | ||
import {ManyToOne} from "../../../../src/decorator/relations/ManyToOne"; | ||
import {JoinColumn} from "../../../../src/decorator/relations/JoinColumn"; | ||
import {DeleteDateColumn} from "../../../../src"; | ||
|
||
@Entity() | ||
export class Post { | ||
|
||
@PrimaryGeneratedColumn() | ||
id: number; | ||
|
||
@Column() | ||
categoryId: string; | ||
|
||
@ManyToOne(() => Category, category => category.posts, { orphanedRowAction: "soft-delete" }) | ||
@JoinColumn({ name: "categoryId" }) | ||
category: Category; | ||
|
||
@DeleteDateColumn() | ||
deletedAt?: Date; | ||
} |