Skip to content
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

fix: Update child's mpath even if parentId was soft-deleted in TreeRepository #10844

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions src/persistence/tree/MaterializedPathSubjectExecutor.ts
Expand Up @@ -172,6 +172,7 @@ export class MaterializedPathSubjectExecutor {
}
}),
)
.withDeleted()
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the main change of the PR

.getRawOne()
.then((result) => (result ? result["path"] : ""))
}
Expand Down
36 changes: 36 additions & 0 deletions test/github-issues/10843/entity/node.ts
@@ -0,0 +1,36 @@
import {
TreeChildren,
TreeParent,
Entity,
PrimaryGeneratedColumn,
DeleteDateColumn,
Column,
Tree,
JoinColumn,
} from "../../../../src"

@Entity("node")
@Tree("materialized-path")
export class Node {
@PrimaryGeneratedColumn({ type: "int" })
id?: number

@DeleteDateColumn()
deletedAt?: Date

@Column("varchar")
name!: string

@TreeChildren({ cascade: true })
children?: Node[]

@Column({ type: "int", nullable: true, name: "parentId" })
parentId?: number

@TreeParent()
@JoinColumn({
name: "parentId",
referencedColumnName: "id",
})
parent?: Node
}
63 changes: 63 additions & 0 deletions test/github-issues/10843/issue-10843.ts
@@ -0,0 +1,63 @@
import "reflect-metadata"
import {
createTestingConnections,
closeTestingConnections,
reloadTestingDatabases,
} from "../../utils/test-utils"
import { DataSource } from "../../../src"
import { Node } from "./entity/node"
import { expect } from "chai"

describe("github issues > #10843 TreeRepository does not update mpath if parentId was soft-deleted", () => {
let dataSources: DataSource[]
before(
async () =>
(dataSources = await createTestingConnections({
entities: [__dirname + "/entity/*{.js,.ts}"],
schemaCreate: true,
dropSchema: true,
relationLoadStrategy: "query",
enabledDrivers: ["mysql"],
})),
)
beforeEach(() => reloadTestingDatabases(dataSources))
after(() => closeTestingConnections(dataSources))

it("Should update mpath even if parent was soft deleted", () =>
Promise.all(
dataSources.map(async (dataSource) => {
const nodeRepository = dataSource.getTreeRepository(Node)

// Entity instances setup
const parent = await nodeRepository.save(
nodeRepository.create({ name: "root node" }),
)
const child = await nodeRepository.save(
nodeRepository.create({ name: "child node", parent }),
)

// Validate mpath
let [mpath] = await dataSource.query(
"SELECT mpath FROM node WHERE id = ?",
[child.id],
)
expect(mpath?.mpath).to.be.equal(`${parent.id}.${child.id}.`)
// Soft delete parent
await nodeRepository.softDelete(parent)

// Assign new parent
const newParent = await nodeRepository.save(
nodeRepository.create({ name: "root node 2" }),
)
child.parent = newParent
await nodeRepository.save(child)

;[mpath] = await dataSource.query(
"SELECT mpath FROM node WHERE id = ?",
[child.id],
)

expect(mpath?.mpath).to.be.equal(`${newParent.id}.${child.id}.`)
}),
))
})