Skip to content

Commit c6ade2f

Browse files
committed
refactor: use v0.0.13 proto definitions
1 parent 19208bf commit c6ade2f

37 files changed

+2598
-1705
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ dist/
44
.env
55
.DS_Store
66
.npmrc
7+
yarn-error.log

bin/server.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ const protoConfig = [
1919
`--plugin=${PLUGIN_PATH}`,
2020
// https://github.com/stephenh/ts-proto/blob/main/README.markdown
2121
"--ts_proto_opt=outputServices=grpc-js,env=node,useOptionals=messages,exportCommonSymbols=false,esModuleInterop=true",
22-
`--ts_proto_opt=stringEnums=true`,
2322
`--ts_proto_opt=useDate=string`,
2423
`--ts_proto_opt=oneof=unions`,
2524
`--ts_proto_opt=addGrpcMetadata=true`,

package.json

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,26 @@
2323
"grpc-server-reflection": "^0.1.5",
2424
"lodash": "^4.17.21",
2525
"moment": "^2.29.4",
26-
"momentjs": "^2.0.0",
2726
"source-map-support": "^0.5.21",
28-
"topcoder-interface": "github:topcoder-platform/plat-interface-definition#feat/challenge-acl-proto",
27+
"topcoder-interface": "github:topcoder-platform/plat-interface-definition#v0.0.13",
2928
"uuidv4": "^6.2.13"
3029
},
3130
"devDependencies": {
3231
"@types/lodash": "^4.14.186",
3332
"@types/node": "18.11.18",
3433
"ts-node-dev": "^2.0.0",
3534
"ts-proto": "^1.126.1",
36-
"typescript": "^4.9.4"
35+
"typescript": "^4.9.4",
36+
"@commitlint/cli": "^17.3.0",
37+
"@commitlint/config-conventional": "^17.3.0",
38+
"@commitlint/config-lerna-scopes": "^17.2.1",
39+
"@typescript-eslint/eslint-plugin": "^5.47.1",
40+
"@typescript-eslint/parser": "^5.47.1",
41+
"commitlint": "^17.3.0",
42+
"eslint": "^8.30.0",
43+
"prettier": "^2.8.1",
44+
"eslint-config-prettier": "^8.5.0",
45+
"eslint-plugin-prettier": "^4.2.1"
3746
},
3847
"volta": {
3948
"node": "18.13.0",

src/domain/GroupContestEligibility.ts

Lines changed: 58 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,23 @@ import { Operator, QueryBuilder } from "@topcoder-framework/client-relational";
22
import { CreateResult } from "@topcoder-framework/lib-common";
33
import _ from "lodash";
44
import { queryRunner } from "../helper/QueryRunner";
5-
import { GetContestEligibilityInput, ContestEligibilityList, ContestEligibility, GetGroupContestEligibilityInput, GroupContestEligibilityList, GroupContestEligibility, DeleteContestEligibilityInput, DeleteGroupContestEligibilityInput } from "../models/domain-layer/legacy/group_contest_eligibility";
5+
import {
6+
ContestEligibility,
7+
ContestEligibilityList,
8+
DeleteContestEligibilityInput,
9+
DeleteGroupContestEligibilityInput,
10+
GetContestEligibilityInput,
11+
GetGroupContestEligibilityInput,
12+
GroupContestEligibility,
13+
GroupContestEligibilityList,
14+
} from "../models/domain-layer/legacy/group_contest_eligibility";
615
import { ContestEligibilitySchema } from "../schema/contest_eligibility/ContestEligibility";
716
import { GroupContestEligibilitySchema } from "../schema/contest_eligibility/GroupContestEligibility";
817

918
class LegacyGroupContestEligibilityDomain {
10-
public async getContestEligibilities(input:GetContestEligibilityInput): Promise<ContestEligibilityList> {
19+
public async getContestEligibilities(
20+
input: GetContestEligibilityInput
21+
): Promise<ContestEligibilityList> {
1122
const { rows } = await queryRunner.run(
1223
new QueryBuilder(ContestEligibilitySchema)
1324
.select(..._.map(ContestEligibilitySchema.columns))
@@ -20,15 +31,18 @@ class LegacyGroupContestEligibilityDomain {
2031
.build()
2132
);
2233

23-
return { contestEligibilities: rows && rows?.length > 0 ? rows!.map(r => ContestEligibility.fromPartial(r as ContestEligibility)) : [] }
34+
return {
35+
contestEligibilities:
36+
rows && rows?.length > 0
37+
? rows!.map((r) => ContestEligibility.fromPartial(r as ContestEligibility))
38+
: [],
39+
};
2440
}
2541

26-
public async createContestEligibility(input:ContestEligibility): Promise<CreateResult> {
42+
public async createContestEligibility(input: ContestEligibility): Promise<CreateResult> {
2743
const { lastInsertId } = await queryRunner.run(
28-
new QueryBuilder(ContestEligibilitySchema)
29-
.insert({ ...input })
30-
.build()
31-
)
44+
new QueryBuilder(ContestEligibilitySchema).insert({ ...input }).build()
45+
);
3246
return {
3347
kind: {
3448
$case: "integerId",
@@ -37,28 +51,39 @@ class LegacyGroupContestEligibilityDomain {
3751
};
3852
}
3953

40-
public async getGroupContestEligibilities(input:GetGroupContestEligibilityInput): Promise<GroupContestEligibilityList> {
54+
public async getGroupContestEligibilities(
55+
input: GetGroupContestEligibilityInput
56+
): Promise<GroupContestEligibilityList> {
4157
const { rows } = await queryRunner.run(
4258
new QueryBuilder(GroupContestEligibilitySchema)
4359
.select(..._.map(GroupContestEligibilitySchema.columns))
44-
.where(GroupContestEligibilitySchema.columns.contestEligibilityId, Operator.OPERATOR_EQUAL, {
45-
value: {
46-
$case: "intValue",
47-
intValue: input.contestEligibilityId,
48-
},
49-
})
60+
.where(
61+
GroupContestEligibilitySchema.columns.contestEligibilityId,
62+
Operator.OPERATOR_EQUAL,
63+
{
64+
value: {
65+
$case: "intValue",
66+
intValue: input.contestEligibilityId,
67+
},
68+
}
69+
)
5070
.build()
5171
);
5272

53-
return { groupContestEligibilities: rows && rows?.length > 0 ? rows!.map(r => GroupContestEligibility.fromPartial(r as GroupContestEligibility)) : [] }
73+
return {
74+
groupContestEligibilities:
75+
rows && rows?.length > 0
76+
? rows!.map((r) => GroupContestEligibility.fromPartial(r as GroupContestEligibility))
77+
: [],
78+
};
5479
}
5580

56-
public async createGroupContestEligibility(input:GroupContestEligibility): Promise<CreateResult> {
81+
public async createGroupContestEligibility(
82+
input: GroupContestEligibility
83+
): Promise<CreateResult> {
5784
const { lastInsertId } = await queryRunner.run(
58-
new QueryBuilder(GroupContestEligibilitySchema)
59-
.insert({ ...input })
60-
.build()
61-
)
85+
new QueryBuilder(GroupContestEligibilitySchema).insert({ ...input }).build()
86+
);
6287
return {
6388
kind: {
6489
$case: "integerId",
@@ -67,7 +92,7 @@ class LegacyGroupContestEligibilityDomain {
6792
};
6893
}
6994

70-
public async deleteContestEligibility (input: DeleteContestEligibilityInput) {
95+
public async deleteContestEligibility(input: DeleteContestEligibilityInput) {
7196
await queryRunner.run(
7297
new QueryBuilder(ContestEligibilitySchema)
7398
.delete()
@@ -81,16 +106,20 @@ class LegacyGroupContestEligibilityDomain {
81106
);
82107
}
83108

84-
public async deleteGroupContestEligibility (input: DeleteGroupContestEligibilityInput) {
109+
public async deleteGroupContestEligibility(input: DeleteGroupContestEligibilityInput) {
85110
await queryRunner.run(
86111
new QueryBuilder(GroupContestEligibilitySchema)
87112
.delete()
88-
.where(GroupContestEligibilitySchema.columns.contestEligibilityId, Operator.OPERATOR_EQUAL, {
89-
value: {
90-
$case: "intValue",
91-
intValue: input.contestEligibilityId,
92-
},
93-
})
113+
.where(
114+
GroupContestEligibilitySchema.columns.contestEligibilityId,
115+
Operator.OPERATOR_EQUAL,
116+
{
117+
value: {
118+
$case: "intValue",
119+
intValue: input.contestEligibilityId,
120+
},
121+
}
122+
)
94123
.andWhere(GroupContestEligibilitySchema.columns.groupId, Operator.OPERATOR_EQUAL, {
95124
value: {
96125
$case: "intValue",

0 commit comments

Comments
 (0)