jp.db.schemas 1.0.25 → 1.0.27
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.
- package/dist/repositories/users.repository.d.ts +5 -0
- package/dist/repositories/users.repository.d.ts.map +1 -1
- package/dist/repositories/users.repository.js +25 -0
- package/dist/repositories/users.repository.js.map +1 -1
- package/dist/schemas/user.ok.schema.d.ts +16 -1
- package/dist/schemas/user.ok.schema.d.ts.map +1 -1
- package/dist/schemas/user.ok.schema.js +0 -4
- package/dist/schemas/user.ok.schema.js.map +1 -1
- package/package.json +1 -1
- package/src/repositories/users.repository.ts +30 -0
- package/src/schemas/user.ok.schema.ts +19 -3
|
@@ -5,6 +5,11 @@ export declare class UsersRepository {
|
|
|
5
5
|
constructor(userModel: Model<UserDocument>);
|
|
6
6
|
findById(id: string): Promise<User | null>;
|
|
7
7
|
findByVKId(vkId: number): Promise<User | null>;
|
|
8
|
+
findByOkId(okId: string): Promise<User | null>;
|
|
9
|
+
findByYAId(yaId: string): Promise<User | null>;
|
|
10
|
+
findByGoogleId(googleId: string): Promise<User | null>;
|
|
11
|
+
findByFBId(fbId: string): Promise<User | null>;
|
|
12
|
+
findByTGId(tgId: string): Promise<User | null>;
|
|
8
13
|
findAndCount(userName: string, limit: number, skip: number): Promise<{
|
|
9
14
|
items: Array<User>;
|
|
10
15
|
total: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"users.repository.d.ts","sourceRoot":"","sources":["../../src/repositories/users.repository.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAEjC,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,KAAK,CAAC;AAWzC,qBACa,eAAe;IACa,OAAO,CAAC,SAAS;gBAAT,SAAS,EAAE,KAAK,CAAC,YAAY,CAAC;IAGrE,QAAQ,CAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;IAM3C,UAAU,CAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;IAM/C,YAAY,CAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;QACxE,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QACnB,KAAK,EAAE,MAAM,CAAA;KAChB,CAAC;IAeI,UAAU,CAAE,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAI/C,UAAU,CAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC;CAc/G"}
|
|
1
|
+
{"version":3,"file":"users.repository.d.ts","sourceRoot":"","sources":["../../src/repositories/users.repository.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAEjC,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,KAAK,CAAC;AAWzC,qBACa,eAAe;IACa,OAAO,CAAC,SAAS;gBAAT,SAAS,EAAE,KAAK,CAAC,YAAY,CAAC;IAGrE,QAAQ,CAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;IAM3C,UAAU,CAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;IAM/C,UAAU,CAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;IAM/C,UAAU,CAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;IAM/C,cAAc,CAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;IAMvD,UAAU,CAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;IAM/C,UAAU,CAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;IAM/C,YAAY,CAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;QACxE,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QACnB,KAAK,EAAE,MAAM,CAAA;KAChB,CAAC;IAeI,UAAU,CAAE,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAI/C,UAAU,CAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC;CAc/G"}
|
|
@@ -38,6 +38,31 @@ let UsersRepository = class UsersRepository {
|
|
|
38
38
|
.findOne({ 'vkUser.id': vkId })
|
|
39
39
|
.exec();
|
|
40
40
|
}
|
|
41
|
+
async findByOkId(okId) {
|
|
42
|
+
return this.userModel
|
|
43
|
+
.findOne({ 'okUser.uid': okId })
|
|
44
|
+
.exec();
|
|
45
|
+
}
|
|
46
|
+
async findByYAId(yaId) {
|
|
47
|
+
return this.userModel
|
|
48
|
+
.findOne({ 'yaUser.userId': yaId })
|
|
49
|
+
.exec();
|
|
50
|
+
}
|
|
51
|
+
async findByGoogleId(googleId) {
|
|
52
|
+
return this.userModel
|
|
53
|
+
.findOne({ 'googleUser.userId': googleId })
|
|
54
|
+
.exec();
|
|
55
|
+
}
|
|
56
|
+
async findByFBId(fbId) {
|
|
57
|
+
return this.userModel
|
|
58
|
+
.findOne({ 'fbUser.playerId': fbId })
|
|
59
|
+
.exec();
|
|
60
|
+
}
|
|
61
|
+
async findByTGId(tgId) {
|
|
62
|
+
return this.userModel
|
|
63
|
+
.findOne({ 'tgUser.id': tgId })
|
|
64
|
+
.exec();
|
|
65
|
+
}
|
|
41
66
|
async findAndCount(userName, limit, skip) {
|
|
42
67
|
const items = await this.userModel
|
|
43
68
|
.find(getFullNameFilter(userName))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"users.repository.js","sourceRoot":"","sources":["../../src/repositories/users.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,+CAA+C;AAC/C,uCAAiC;AAEjC,2BAAyC;AAEzC,SAAS,iBAAiB,CAAE,QAAgB;IACxC,MAAM,UAAU,GAAG;QACf,QAAQ,EAAE,QAAQ;QAClB,UAAU,EAAE,GAAG;KAClB,CAAC;IAEF,OAAO,QAAQ,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,EAAE,aAAa,EAAE,UAAU,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;AAC9F,CAAC;AAGM,IAAM,eAAe,GAArB,MAAM,eAAe;IACxB,YAA6C,SAA8B;QAA9B,cAAS,GAAT,SAAS,CAAqB;IAC3E,CAAC;IAED,KAAK,CAAC,QAAQ,CAAE,EAAU;QACtB,OAAO,IAAI,CAAC,SAAS;aAChB,QAAQ,CAAC,EAAE,CAAC;aACZ,IAAI,EAAE,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,UAAU,CAAE,IAAY;QAC1B,OAAO,IAAI,CAAC,SAAS;aAChB,OAAO,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;aAC9B,IAAI,EAAE,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,YAAY,CAAE,QAAgB,EAAE,KAAa,EAAE,IAAY;QAI7D,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,SAAS;aAC7B,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;aACjC,KAAK,CAAC,KAAK,CAAC;aACZ,IAAI,CAAC,IAAI,CAAC;aACV,IAAI,EAAE,CAAC;QAEZ,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,SAAS;aAC7B,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;aACjC,cAAc,EAAE;aAChB,IAAI,EAAE,CAAC;QAEZ,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,UAAU,CAAE,IAAmB;QACjC,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,UAAU,CAAE,MAAc,EAAE,IAAmB,EAAE,aAAsB;QACzE,OAAO,IAAI,CAAC,OAAO,CAAC;QAEpB,OAAO,IAAI,CAAC,SAAS,CAAC,iBAAiB,CACnC,MAAM,EACN;YACI,IAAI,oBACG,IAAI,CACV;YACD,IAAI,EAAE,EAAE,OAAO,EAAE,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,CAAC,EAAE;SACxC,EACD,EAAE,GAAG,EAAE,IAAI,EAAE,CAChB,CAAC,IAAI,EAAE,CAAC;IACb,CAAC;CACJ,CAAA;
|
|
1
|
+
{"version":3,"file":"users.repository.js","sourceRoot":"","sources":["../../src/repositories/users.repository.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { HydratedDocument } from 'mongoose';
|
|
2
2
|
export type OKUserLocationDocument = HydratedDocument<OKUserLocation>;
|
|
3
3
|
export declare class OKUserLocation {
|
|
4
|
-
id: number;
|
|
5
4
|
city: String;
|
|
6
5
|
country: String;
|
|
7
6
|
countryCode: String;
|
|
@@ -36,4 +35,20 @@ export declare const OKUserSchema: import("mongoose").Schema<OKUser, import("mon
|
|
|
36
35
|
} & {
|
|
37
36
|
__v: number;
|
|
38
37
|
}>;
|
|
38
|
+
export type OkLocation = {
|
|
39
|
+
city: string;
|
|
40
|
+
country: string;
|
|
41
|
+
countryCode: string;
|
|
42
|
+
countryName: string;
|
|
43
|
+
};
|
|
44
|
+
export type OkUserDto = {
|
|
45
|
+
uid: string;
|
|
46
|
+
birthday: string;
|
|
47
|
+
birthdaySet: boolean;
|
|
48
|
+
age: number;
|
|
49
|
+
first_name: string;
|
|
50
|
+
last_name: string;
|
|
51
|
+
location: OkLocation;
|
|
52
|
+
pic128x128: string;
|
|
53
|
+
};
|
|
39
54
|
//# sourceMappingURL=user.ok.schema.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.ok.schema.d.ts","sourceRoot":"","sources":["../../src/schemas/user.ok.schema.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAE5C,MAAM,MAAM,sBAAsB,GAAG,gBAAgB,CAAC,cAAc,CAAC,CAAC;AAEtE,qBACa,cAAc;IAEvB,
|
|
1
|
+
{"version":3,"file":"user.ok.schema.d.ts","sourceRoot":"","sources":["../../src/schemas/user.ok.schema.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAE5C,MAAM,MAAM,sBAAsB,GAAG,gBAAgB,CAAC,cAAc,CAAC,CAAC;AAEtE,qBACa,cAAc;IAEvB,IAAI,EAAE,MAAM,CAAC;IAGb,OAAO,EAAE,MAAM,CAAC;IAGhB,WAAW,EAAE,MAAM,CAAC;IAGpB,WAAW,EAAE,MAAM,CAAC;CACvB;AAED,eAAO,MAAM,oBAAoB;;;;;;;;EAA+C,CAAC;AAEjF,MAAM,MAAM,cAAc,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;AAEtD,qBACa,MAAM;IAEf,GAAG,EAAE,MAAM,CAAC;IAGZ,QAAQ,EAAE,MAAM,CAAC;IAGjB,WAAW,EAAE,OAAO,CAAC;IAGrB,GAAG,EAAE,MAAM,CAAC;IAGZ,UAAU,EAAE,MAAM,CAAC;IAGnB,SAAS,EAAE,MAAM,CAAC;IAGlB,QAAQ,EAAE,cAAc,CAAC;IAGzB,UAAU,EAAE,MAAM,CAAC;CACtB;AAED,eAAO,MAAM,YAAY;;;;;;;;EAAuC,CAAC;AAGjE,MAAM,MAAM,UAAU,GAAG;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,OAAO,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,UAAU,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;CACtB,CAAC"}
|
|
@@ -14,10 +14,6 @@ const mongoose_1 = require("@nestjs/mongoose");
|
|
|
14
14
|
let OKUserLocation = class OKUserLocation {
|
|
15
15
|
};
|
|
16
16
|
exports.OKUserLocation = OKUserLocation;
|
|
17
|
-
__decorate([
|
|
18
|
-
(0, mongoose_1.Prop)(),
|
|
19
|
-
__metadata("design:type", Number)
|
|
20
|
-
], OKUserLocation.prototype, "id", void 0);
|
|
21
17
|
__decorate([
|
|
22
18
|
(0, mongoose_1.Prop)(),
|
|
23
19
|
__metadata("design:type", String)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.ok.schema.js","sourceRoot":"","sources":["../../src/schemas/user.ok.schema.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAA+D;AAMxD,IAAM,cAAc,GAApB,MAAM,cAAc;
|
|
1
|
+
{"version":3,"file":"user.ok.schema.js","sourceRoot":"","sources":["../../src/schemas/user.ok.schema.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAA+D;AAMxD,IAAM,cAAc,GAApB,MAAM,cAAc;CAY1B,CAAA;AAZY,wCAAc;AAEvB;IADC,IAAA,eAAI,GAAE;8BACD,MAAM;4CAAC;AAGb;IADC,IAAA,eAAI,GAAE;8BACE,MAAM;+CAAC;AAGhB;IADC,IAAA,eAAI,GAAE;8BACM,MAAM;mDAAC;AAGpB;IADC,IAAA,eAAI,GAAE;8BACM,MAAM;mDAAC;yBAXX,cAAc;IAD1B,IAAA,iBAAM,GAAE;GACI,cAAc,CAY1B;AAEY,QAAA,oBAAoB,GAAG,wBAAa,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;AAK1E,IAAM,MAAM,GAAZ,MAAM,MAAM;CAwBlB,CAAA;AAxBY,wBAAM;AAEf;IADC,IAAA,eAAI,GAAE;;mCACK;AAGZ;IADC,IAAA,eAAI,GAAE;;wCACU;AAGjB;IADC,IAAA,eAAI,GAAE;;2CACc;AAGrB;IADC,IAAA,eAAI,GAAE;;mCACK;AAGZ;IADC,IAAA,eAAI,GAAE;;0CACY;AAGnB;IADC,IAAA,eAAI,GAAE;;yCACW;AAGlB;IADC,IAAA,eAAI,GAAE;8BACG,cAAc;wCAAC;AAGzB;IADC,IAAA,eAAI,GAAE;;0CACY;iBAvBV,MAAM;IADlB,IAAA,iBAAM,GAAE;GACI,MAAM,CAwBlB;AAEY,QAAA,YAAY,GAAG,wBAAa,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -30,6 +30,36 @@ export class UsersRepository {
|
|
|
30
30
|
.exec();
|
|
31
31
|
}
|
|
32
32
|
|
|
33
|
+
async findByOkId (okId: string): Promise<User | null> {
|
|
34
|
+
return this.userModel
|
|
35
|
+
.findOne({ 'okUser.uid': okId })
|
|
36
|
+
.exec();
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
async findByYAId (yaId: string): Promise<User | null> {
|
|
40
|
+
return this.userModel
|
|
41
|
+
.findOne({ 'yaUser.userId': yaId })
|
|
42
|
+
.exec();
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
async findByGoogleId (googleId: string): Promise<User | null> {
|
|
46
|
+
return this.userModel
|
|
47
|
+
.findOne({ 'googleUser.userId': googleId })
|
|
48
|
+
.exec();
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
async findByFBId (fbId: string): Promise<User | null> {
|
|
52
|
+
return this.userModel
|
|
53
|
+
.findOne({ 'fbUser.playerId': fbId })
|
|
54
|
+
.exec();
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
async findByTGId (tgId: string): Promise<User | null> {
|
|
58
|
+
return this.userModel
|
|
59
|
+
.findOne({ 'tgUser.id': tgId })
|
|
60
|
+
.exec();
|
|
61
|
+
}
|
|
62
|
+
|
|
33
63
|
async findAndCount (userName: string, limit: number, skip: number): Promise<{
|
|
34
64
|
items: Array<User>,
|
|
35
65
|
total: number
|
|
@@ -5,9 +5,6 @@ export type OKUserLocationDocument = HydratedDocument<OKUserLocation>;
|
|
|
5
5
|
|
|
6
6
|
@Schema()
|
|
7
7
|
export class OKUserLocation {
|
|
8
|
-
@Prop()
|
|
9
|
-
id: number;
|
|
10
|
-
|
|
11
8
|
@Prop()
|
|
12
9
|
city: String;
|
|
13
10
|
|
|
@@ -53,3 +50,22 @@ export class OKUser {
|
|
|
53
50
|
}
|
|
54
51
|
|
|
55
52
|
export const OKUserSchema = SchemaFactory.createForClass(OKUser);
|
|
53
|
+
|
|
54
|
+
|
|
55
|
+
export type OkLocation = {
|
|
56
|
+
city: string;
|
|
57
|
+
country: string;
|
|
58
|
+
countryCode: string;
|
|
59
|
+
countryName: string;
|
|
60
|
+
};
|
|
61
|
+
|
|
62
|
+
export type OkUserDto = {
|
|
63
|
+
uid: string;
|
|
64
|
+
birthday: string;
|
|
65
|
+
birthdaySet: boolean;
|
|
66
|
+
age: number;
|
|
67
|
+
first_name: string;
|
|
68
|
+
last_name: string;
|
|
69
|
+
location: OkLocation;
|
|
70
|
+
pic128x128: string;
|
|
71
|
+
};
|