@trafficgroup/knex-rel 0.0.11 → 0.0.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -20,13 +20,13 @@ class FolderDAO {
|
|
|
20
20
|
}
|
|
21
21
|
create(item) {
|
|
22
22
|
return __awaiter(this, void 0, void 0, function* () {
|
|
23
|
-
const [createdFolder] = yield this._knex("
|
|
23
|
+
const [createdFolder] = yield this._knex("folders").insert(item).returning("*");
|
|
24
24
|
return createdFolder;
|
|
25
25
|
});
|
|
26
26
|
}
|
|
27
27
|
getById(id) {
|
|
28
28
|
return __awaiter(this, void 0, void 0, function* () {
|
|
29
|
-
const folder = yield this._knex("
|
|
29
|
+
const folder = yield this._knex("folders as f")
|
|
30
30
|
.innerJoin("study as s", "f.studyId", "s.id")
|
|
31
31
|
.select("f.*", this._knex.raw("to_jsonb(s.*) as study"))
|
|
32
32
|
.where("f.id", id)
|
|
@@ -36,7 +36,7 @@ class FolderDAO {
|
|
|
36
36
|
}
|
|
37
37
|
getByUuid(uuid) {
|
|
38
38
|
return __awaiter(this, void 0, void 0, function* () {
|
|
39
|
-
const folder = yield this._knex("
|
|
39
|
+
const folder = yield this._knex("folders as f")
|
|
40
40
|
.innerJoin("study as s", "f.studyId", "s.id")
|
|
41
41
|
.select("f.*", this._knex.raw("to_jsonb(s.*) as study"))
|
|
42
42
|
.where("f.uuid", uuid)
|
|
@@ -46,20 +46,20 @@ class FolderDAO {
|
|
|
46
46
|
}
|
|
47
47
|
update(id, item) {
|
|
48
48
|
return __awaiter(this, void 0, void 0, function* () {
|
|
49
|
-
const [updatedFolder] = yield this._knex("
|
|
49
|
+
const [updatedFolder] = yield this._knex("folders").where({ id }).update(item).returning("*");
|
|
50
50
|
return updatedFolder || null;
|
|
51
51
|
});
|
|
52
52
|
}
|
|
53
53
|
delete(id) {
|
|
54
54
|
return __awaiter(this, void 0, void 0, function* () {
|
|
55
|
-
const result = yield this._knex("
|
|
55
|
+
const result = yield this._knex("folders").where({ id }).del();
|
|
56
56
|
return result > 0;
|
|
57
57
|
});
|
|
58
58
|
}
|
|
59
59
|
getAll(page, limit, studyId) {
|
|
60
60
|
return __awaiter(this, void 0, void 0, function* () {
|
|
61
61
|
const offset = (page - 1) * limit;
|
|
62
|
-
const query = this._knex("
|
|
62
|
+
const query = this._knex("folders as f")
|
|
63
63
|
.innerJoin("study as s", "f.studyId", "s.id")
|
|
64
64
|
.select("f.*", this._knex.raw("to_jsonb(s.*) as study"));
|
|
65
65
|
if (studyId !== undefined && studyId !== null) {
|
|
@@ -67,13 +67,13 @@ class FolderDAO {
|
|
|
67
67
|
}
|
|
68
68
|
const [countResult] = yield query.clone().clearSelect().count("* as count");
|
|
69
69
|
const totalCount = +countResult.count;
|
|
70
|
-
const
|
|
70
|
+
const folders = yield query.clone().limit(limit).offset(offset);
|
|
71
71
|
return {
|
|
72
72
|
success: true,
|
|
73
|
-
data:
|
|
73
|
+
data: folders,
|
|
74
74
|
page,
|
|
75
75
|
limit,
|
|
76
|
-
count:
|
|
76
|
+
count: folders.length,
|
|
77
77
|
totalCount,
|
|
78
78
|
totalPages: Math.ceil(totalCount / limit),
|
|
79
79
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"folder.dao.js","sourceRoot":"","sources":["../../../src/dao/folder/folder.dao.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAGA,0EAA+C;AAE/C,MAAa,SAAS;IAAtB;QACY,UAAK,GAAyB,wBAAW,CAAC,aAAa,EAAE,CAAC;IA2DtE,CAAC;IAzDS,MAAM,CAAC,IAAa;;YACtB,MAAM,CAAC,aAAa,CAAC,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"folder.dao.js","sourceRoot":"","sources":["../../../src/dao/folder/folder.dao.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -7,12 +7,12 @@ export class FolderDAO implements IBaseDAO<IFolder> {
|
|
|
7
7
|
private _knex: Knex<any, unknown[]> = KnexManager.getConnection();
|
|
8
8
|
|
|
9
9
|
async create(item: IFolder): Promise<IFolder> {
|
|
10
|
-
const [createdFolder] = await this._knex("
|
|
10
|
+
const [createdFolder] = await this._knex("folders").insert(item).returning("*");
|
|
11
11
|
return createdFolder;
|
|
12
12
|
}
|
|
13
13
|
|
|
14
14
|
async getById(id: number): Promise<IFolder | null> {
|
|
15
|
-
const folder = await this._knex("
|
|
15
|
+
const folder = await this._knex("folders as f")
|
|
16
16
|
.innerJoin("study as s", "f.studyId", "s.id")
|
|
17
17
|
.select("f.*", this._knex.raw("to_jsonb(s.*) as study"))
|
|
18
18
|
.where("f.id", id)
|
|
@@ -21,7 +21,7 @@ export class FolderDAO implements IBaseDAO<IFolder> {
|
|
|
21
21
|
}
|
|
22
22
|
|
|
23
23
|
async getByUuid(uuid: string): Promise<IFolder | null> {
|
|
24
|
-
const folder = await this._knex("
|
|
24
|
+
const folder = await this._knex("folders as f")
|
|
25
25
|
.innerJoin("study as s", "f.studyId", "s.id")
|
|
26
26
|
.select("f.*", this._knex.raw("to_jsonb(s.*) as study"))
|
|
27
27
|
.where("f.uuid", uuid)
|
|
@@ -30,19 +30,19 @@ export class FolderDAO implements IBaseDAO<IFolder> {
|
|
|
30
30
|
}
|
|
31
31
|
|
|
32
32
|
async update(id: number, item: Partial<IFolder>): Promise<IFolder | null> {
|
|
33
|
-
const [updatedFolder] = await this._knex("
|
|
33
|
+
const [updatedFolder] = await this._knex("folders").where({ id }).update(item).returning("*");
|
|
34
34
|
return updatedFolder || null;
|
|
35
35
|
}
|
|
36
36
|
|
|
37
37
|
async delete(id: number): Promise<boolean> {
|
|
38
|
-
const result = await this._knex("
|
|
38
|
+
const result = await this._knex("folders").where({ id }).del();
|
|
39
39
|
return result > 0;
|
|
40
40
|
}
|
|
41
41
|
|
|
42
42
|
async getAll(page: number, limit: number, studyId?: number | null): Promise<IDataPaginator<IFolder>> {
|
|
43
43
|
const offset = (page - 1) * limit;
|
|
44
44
|
|
|
45
|
-
const query = this._knex("
|
|
45
|
+
const query = this._knex("folders as f")
|
|
46
46
|
.innerJoin("study as s", "f.studyId", "s.id")
|
|
47
47
|
.select("f.*", this._knex.raw("to_jsonb(s.*) as study"));
|
|
48
48
|
if (studyId !== undefined && studyId !== null) {
|
|
@@ -51,14 +51,14 @@ export class FolderDAO implements IBaseDAO<IFolder> {
|
|
|
51
51
|
|
|
52
52
|
const [countResult] = await query.clone().clearSelect().count("* as count");
|
|
53
53
|
const totalCount = +countResult.count;
|
|
54
|
-
const
|
|
54
|
+
const folders = await query.clone().limit(limit).offset(offset);
|
|
55
55
|
|
|
56
56
|
return {
|
|
57
57
|
success: true,
|
|
58
|
-
data:
|
|
58
|
+
data: folders,
|
|
59
59
|
page,
|
|
60
60
|
limit,
|
|
61
|
-
count:
|
|
61
|
+
count: folders.length,
|
|
62
62
|
totalCount,
|
|
63
63
|
totalPages: Math.ceil(totalCount / limit),
|
|
64
64
|
};
|