diff options
author | Chocobozzz <me@florianbigard.com> | 2023-07-31 14:34:36 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2023-08-11 15:02:33 +0200 |
commit | 3a4992633ee62d5edfbb484d9c6bcb3cf158489d (patch) | |
tree | e4510b39bdac9c318fdb4b47018d08f15368b8f0 /server/models/user/user-video-history.ts | |
parent | 04d1da5621d25d59bd5fa1543b725c497bf5d9a8 (diff) | |
download | PeerTube-3a4992633ee62d5edfbb484d9c6bcb3cf158489d.tar.gz PeerTube-3a4992633ee62d5edfbb484d9c6bcb3cf158489d.tar.zst PeerTube-3a4992633ee62d5edfbb484d9c6bcb3cf158489d.zip |
Migrate server to ESM
Sorry for the very big commit that may lead to git log issues and merge
conflicts, but it's a major step forward:
* Server can be faster at startup because imports() are async and we can
easily lazy import big modules
* Angular doesn't seem to support ES import (with .js extension), so we
had to correctly organize peertube into a monorepo:
* Use yarn workspace feature
* Use typescript reference projects for dependencies
* Shared projects have been moved into "packages", each one is now a
node module (with a dedicated package.json/tsconfig.json)
* server/tools have been moved into apps/ and is now a dedicated app
bundled and published on NPM so users don't have to build peertube
cli tools manually
* server/tests have been moved into packages/ so we don't compile
them every time we want to run the server
* Use isolatedModule option:
* Had to move from const enum to const
(https://www.typescriptlang.org/docs/handbook/enums.html#objects-vs-enums)
* Had to explictely specify "type" imports when used in decorators
* Prefer tsx (that uses esbuild under the hood) instead of ts-node to
load typescript files (tests with mocha or scripts):
* To reduce test complexity as esbuild doesn't support decorator
metadata, we only test server files that do not import server
models
* We still build tests files into js files for a faster CI
* Remove unmaintained peertube CLI import script
* Removed some barrels to speed up execution (less imports)
Diffstat (limited to 'server/models/user/user-video-history.ts')
-rw-r--r-- | server/models/user/user-video-history.ts | 111 |
1 files changed, 0 insertions, 111 deletions
diff --git a/server/models/user/user-video-history.ts b/server/models/user/user-video-history.ts deleted file mode 100644 index f4d0889a1..000000000 --- a/server/models/user/user-video-history.ts +++ /dev/null | |||
@@ -1,111 +0,0 @@ | |||
1 | import { DestroyOptions, Op, Transaction } from 'sequelize' | ||
2 | import { AllowNull, BelongsTo, Column, CreatedAt, ForeignKey, IsInt, Model, Table, UpdatedAt } from 'sequelize-typescript' | ||
3 | import { MUserAccountId, MUserId } from '@server/types/models' | ||
4 | import { AttributesOnly } from '@shared/typescript-utils' | ||
5 | import { VideoModel } from '../video/video' | ||
6 | import { UserModel } from './user' | ||
7 | |||
8 | @Table({ | ||
9 | tableName: 'userVideoHistory', | ||
10 | indexes: [ | ||
11 | { | ||
12 | fields: [ 'userId', 'videoId' ], | ||
13 | unique: true | ||
14 | }, | ||
15 | { | ||
16 | fields: [ 'userId' ] | ||
17 | }, | ||
18 | { | ||
19 | fields: [ 'videoId' ] | ||
20 | } | ||
21 | ] | ||
22 | }) | ||
23 | export class UserVideoHistoryModel extends Model<Partial<AttributesOnly<UserVideoHistoryModel>>> { | ||
24 | @CreatedAt | ||
25 | createdAt: Date | ||
26 | |||
27 | @UpdatedAt | ||
28 | updatedAt: Date | ||
29 | |||
30 | @AllowNull(false) | ||
31 | @IsInt | ||
32 | @Column | ||
33 | currentTime: number | ||
34 | |||
35 | @ForeignKey(() => VideoModel) | ||
36 | @Column | ||
37 | videoId: number | ||
38 | |||
39 | @BelongsTo(() => VideoModel, { | ||
40 | foreignKey: { | ||
41 | allowNull: false | ||
42 | }, | ||
43 | onDelete: 'CASCADE' | ||
44 | }) | ||
45 | Video: VideoModel | ||
46 | |||
47 | @ForeignKey(() => UserModel) | ||
48 | @Column | ||
49 | userId: number | ||
50 | |||
51 | @BelongsTo(() => UserModel, { | ||
52 | foreignKey: { | ||
53 | allowNull: false | ||
54 | }, | ||
55 | onDelete: 'CASCADE' | ||
56 | }) | ||
57 | User: UserModel | ||
58 | |||
59 | static listForApi (user: MUserAccountId, start: number, count: number, search?: string) { | ||
60 | return VideoModel.listForApi({ | ||
61 | start, | ||
62 | count, | ||
63 | search, | ||
64 | sort: '-"userVideoHistory"."updatedAt"', | ||
65 | nsfw: null, // All | ||
66 | displayOnlyForFollower: null, | ||
67 | user, | ||
68 | historyOfUser: user | ||
69 | }) | ||
70 | } | ||
71 | |||
72 | static removeUserHistoryElement (user: MUserId, videoId: number) { | ||
73 | const query: DestroyOptions = { | ||
74 | where: { | ||
75 | userId: user.id, | ||
76 | videoId | ||
77 | } | ||
78 | } | ||
79 | |||
80 | return UserVideoHistoryModel.destroy(query) | ||
81 | } | ||
82 | |||
83 | static removeUserHistoryBefore (user: MUserId, beforeDate: string, t: Transaction) { | ||
84 | const query: DestroyOptions = { | ||
85 | where: { | ||
86 | userId: user.id | ||
87 | }, | ||
88 | transaction: t | ||
89 | } | ||
90 | |||
91 | if (beforeDate) { | ||
92 | query.where['updatedAt'] = { | ||
93 | [Op.lt]: beforeDate | ||
94 | } | ||
95 | } | ||
96 | |||
97 | return UserVideoHistoryModel.destroy(query) | ||
98 | } | ||
99 | |||
100 | static removeOldHistory (beforeDate: string) { | ||
101 | const query: DestroyOptions = { | ||
102 | where: { | ||
103 | updatedAt: { | ||
104 | [Op.lt]: beforeDate | ||
105 | } | ||
106 | } | ||
107 | } | ||
108 | |||
109 | return UserVideoHistoryModel.destroy(query) | ||
110 | } | ||
111 | } | ||