Skip to content

Commit bb6302c

Browse files
committed
refactor(test): simplify findOneOrFail({ where }) to findOneByOrFail
1 parent 3860eb0 commit bb6302c

54 files changed

Lines changed: 269 additions & 435 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎test/functional/columns/embedded-columns/columns-embedded-columns.test.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,8 @@ describe("columns > embedded columns", () => {
175175
parent.department = new Department()
176176
parent.department.account = account
177177
await parentRepository.save(parent)
178-
const loadedParent = await parentRepository.findOneOrFail({
179-
where: { id: parent.id },
178+
const loadedParent = await parentRepository.findOneByOrFail({
179+
id: parent.id,
180180
})
181181

182182
loadedParent.should.be.eql({
@@ -192,8 +192,8 @@ describe("columns > embedded columns", () => {
192192
parent.department.account.name = "Updated Account #1"
193193
await parentRepository.save(parent)
194194

195-
const loadedParent1 = await parentRepository.findOneOrFail({
196-
where: { id: parent.id },
195+
const loadedParent1 = await parentRepository.findOneByOrFail({
196+
id: parent.id,
197197
})
198198

199199
loadedParent1.should.be.eql({

‎test/functional/database-schema/vectors/postgres/vector.test.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ describe("columns > vector type", () => {
4343

4444
await postRepository.save(post)
4545

46-
const loadedPost = await postRepository.findOneOrFail({
47-
where: { id: post.id },
46+
const loadedPost = await postRepository.findOneByOrFail({
47+
id: post.id,
4848
})
4949

5050
expect(loadedPost).to.exist
@@ -96,8 +96,8 @@ describe("columns > vector type", () => {
9696

9797
await postRepository.save(post)
9898

99-
const loadedPost = await postRepository.findOneOrFail({
100-
where: { id: post.id },
99+
const loadedPost = await postRepository.findOneByOrFail({
100+
id: post.id,
101101
})
102102

103103
expect(loadedPost).to.exist

‎test/functional/database-schema/vectors/sqlserver/vector.test.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ describe("columns > vector type > sqlserver", () => {
5353

5454
await repository.save(chunk)
5555

56-
const loadedChunk = await repository.findOneOrFail({
57-
where: { id: chunk.id },
56+
const loadedChunk = await repository.findOneByOrFail({
57+
id: chunk.id,
5858
})
5959

6060
expect(loadedChunk).to.exist
@@ -82,8 +82,8 @@ describe("columns > vector type > sqlserver", () => {
8282
point.coords = [4.0, 5.0, 6.0]
8383
await repository.save(point)
8484

85-
const loadedPoint = await repository.findOneOrFail({
86-
where: { id: point.id },
85+
const loadedPoint = await repository.findOneByOrFail({
86+
id: point.id,
8787
})
8888

8989
expect(loadedPoint).to.exist
@@ -211,8 +211,8 @@ describe("columns > vector type > sqlserver", () => {
211211

212212
await repository.save(chunk)
213213

214-
const loadedChunk = await repository.findOneOrFail({
215-
where: { id: chunk.id },
214+
const loadedChunk = await repository.findOneByOrFail({
215+
id: chunk.id,
216216
})
217217

218218
expect(loadedChunk).to.exist

‎test/functional/entity-model/entity-model.test.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,7 @@ describe("entity-model", () => {
2929
post.text = "Huge discussion how good or bad ActiveRecord is."
3030
await post.save()
3131

32-
const loadedPost = await Post.findOneOrFail({
33-
where: { id: post.id },
34-
})
32+
const loadedPost = await Post.findOneByOrFail({ id: post.id })
3533

3634
loadedPost.should.be.instanceOf(Post)
3735
loadedPost.id.should.be.eql(post.id)

‎test/functional/entity-schema/columns/virtual-columns/virtual-columns.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ describe("entity-schema > columns > virtual column", () => {
2525
dataSources.map(async (dataSource) => {
2626
const repo = dataSource.getRepository(Activity)
2727
await repo.save({ id: 0, k1: 1 })
28-
const result = (await repo.findOne({ where: { id: 0 } }))!
28+
const result = (await repo.findOneBy({ id: 0 }))!
2929
expect(result.vK1).eq(result.k1)
3030
expect(result.vK1).eq(1)
3131
}),

‎test/functional/mongodb/basic/mongo-repository/mongo-repository.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,8 +228,8 @@ describe("mongodb > MongoRepository", () => {
228228
dataSource.getMongoRepository(PostWithDeleted)
229229
await seedPosts(postRepository)
230230

231-
const loadedPost = await postRepository.findOne({
232-
where: { title: "notDeleted" },
231+
const loadedPost = await postRepository.findOneBy({
232+
title: "notDeleted",
233233
})
234234
const loadedPostWithDeleted =
235235
await postRepository.findOne({

‎test/functional/null-undefined-handling/find-options.test.ts‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -446,10 +446,8 @@ describe("find options > null and undefined handling", () => {
446446
}
447447

448448
try {
449-
await dataSource.getRepository(Post).findOne({
450-
where: {
451-
text: undefined,
452-
},
449+
await dataSource.getRepository(Post).findOneBy({
450+
text: undefined,
453451
})
454452
expect.fail("Expected query to throw an error")
455453
} catch (error) {
@@ -498,10 +496,8 @@ describe("find options > null and undefined handling", () => {
498496
}
499497

500498
try {
501-
await dataSource.getRepository(Post).findOne({
502-
where: {
503-
category: undefined,
504-
},
499+
await dataSource.getRepository(Post).findOneBy({
500+
category: undefined,
505501
})
506502
expect.fail("Expected query to throw an error")
507503
} catch (error) {
@@ -553,10 +549,8 @@ describe("find options > null and undefined handling", () => {
553549
// Test Repository with findOne
554550
const postWithRepo = await dataSource
555551
.getRepository(Post)
556-
.findOne({
557-
where: {
558-
title: "Post #1",
559-
},
552+
.findOneBy({
553+
title: "Post #1",
560554
})
561555

562556
expect(postWithRepo?.title).to.equal("Post #1")
@@ -702,10 +696,8 @@ describe("find options > null and undefined handling", () => {
702696
// Test Repository with findOne
703697
const postWithRepo = await dataSource
704698
.getRepository(Post)
705-
.findOne({
706-
where: {
707-
title: "Post #2",
708-
},
699+
.findOneBy({
700+
title: "Post #2",
709701
})
710702

711703
expect(postWithRepo?.title).to.equal("Post #2")

‎test/functional/query-builder/composite-primary/composite-primary.test.ts‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,8 @@ describe("query builder > composite primary", () => {
3535

3636
const loadedBar = await dataSource.manager
3737
.getRepository(Bar)
38-
.findOne({
39-
where: {
40-
foo,
41-
},
38+
.findOneBy({
39+
foo,
4240
})
4341

4442
expect(loadedBar!.id).to.be.equal(bar.id)

‎test/functional/query-builder/insert-merge-into/query-builder-insert-merge-into.test.ts‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,8 @@ describe("query builder > insert > merge into", () => {
5151
.execute()
5252

5353
await dataSource.manager
54-
.findOne(Post, {
55-
where: {
56-
id: "post#1",
57-
},
54+
.findOneBy(Post, {
55+
id: "post#1",
5856
})
5957
.should.eventually.be.eql({
6058
id: "post#1",
@@ -103,10 +101,8 @@ describe("query builder > insert > merge into", () => {
103101
.execute()
104102

105103
await dataSource.manager
106-
.findOne(Post, {
107-
where: {
108-
id: "post#1",
109-
},
104+
.findOneBy(Post, {
105+
id: "post#1",
110106
})
111107
.should.eventually.be.eql({
112108
id: "post#1",
@@ -125,10 +121,8 @@ describe("query builder > insert > merge into", () => {
125121
.execute()
126122

127123
await dataSource.manager
128-
.findOne(Post, {
129-
where: {
130-
id: "post#1",
131-
},
124+
.findOneBy(Post, {
125+
id: "post#1",
132126
})
133127
.should.eventually.be.eql({
134128
id: "post#1",

‎test/functional/query-builder/insert-on-conflict/query-builder-insert-on-conflict.test.ts‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,8 @@ describe("query builder > insert > on conflict", () => {
5151
.execute()
5252

5353
await dataSource.manager
54-
.findOne(Post, {
55-
where: {
56-
id: "post#1",
57-
},
54+
.findOneBy(Post, {
55+
id: "post#1",
5856
})
5957
.should.eventually.be.eql({
6058
id: "post#1",
@@ -94,10 +92,8 @@ describe("query builder > insert > on conflict", () => {
9492
.execute()
9593

9694
await dataSource.manager
97-
.findOne(Post, {
98-
where: {
99-
id: "post#1",
100-
},
95+
.findOneBy(Post, {
96+
id: "post#1",
10197
})
10298
.should.eventually.be.eql({
10399
id: "post#1",
@@ -196,10 +192,8 @@ describe("query builder > insert > on conflict", () => {
196192
await builder.execute()
197193

198194
await dataSource.manager
199-
.findOne(Post, {
200-
where: {
201-
id: "post#1",
202-
},
195+
.findOneBy(Post, {
196+
id: "post#1",
203197
})
204198
.should.eventually.be.eql({
205199
id: "post#1",

0 commit comments

Comments
 (0)