Skip to content

Commit ce0febd

Browse files
rakibansaryrakibansary
authored
fix: remove legacy models (#11)
* domain-challenge should be directly include * legacy models Signed-off-by: Rakib Ansary <[email protected]>
1 parent 1d4d831 commit ce0febd

38 files changed

+359
-13049
lines changed

‎bin/server.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ const protoConfig = [
3131
`--descriptor_set_out ${PROTO_REFLECTIONS}`,
3232
`--proto_path ${PROTO_DIR} ${PROTO_DIR}/common/*.proto`,
3333
`--proto_path ${PROTO_DIR} ${PROTO_DIR}/domain-layer/challenge/*.proto`,
34-
`--proto_path ${PROTO_DIR} ${PROTO_DIR}/domain-layer/legacy/*.proto`,
3534
`--proto_path ${PROTO_DIR} ${PROTO_DIR}/domain-layer/challenge/services/*.proto`,
3635
];
3736

‎src/dal/models/nosql/google/protobuf/struct.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ export const Struct = {
108108
},
109109

110110
decode(input: _m0.Reader | Uint8Array, length?: number): Struct {
111-
const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
111+
const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
112112
let end = length === undefined ? reader.len : reader.pos + length;
113113
const message = createBaseStruct();
114114
while (reader.pos < end) {
@@ -202,7 +202,7 @@ export const Struct_FieldsEntry = {
202202
},
203203

204204
decode(input: _m0.Reader | Uint8Array, length?: number): Struct_FieldsEntry {
205-
const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
205+
const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
206206
let end = length === undefined ? reader.len : reader.pos + length;
207207
const message = createBaseStruct_FieldsEntry();
208208
while (reader.pos < end) {
@@ -275,7 +275,7 @@ export const Value = {
275275
},
276276

277277
decode(input: _m0.Reader | Uint8Array, length?: number): Value {
278-
const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
278+
const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
279279
let end = length === undefined ? reader.len : reader.pos + length;
280280
const message = createBaseValue();
281281
while (reader.pos < end) {
@@ -428,7 +428,7 @@ export const ListValue = {
428428
},
429429

430430
decode(input: _m0.Reader | Uint8Array, length?: number): ListValue {
431-
const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
431+
const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
432432
let end = length === undefined ? reader.len : reader.pos + length;
433433
const message = createBaseListValue();
434434
while (reader.pos < end) {

‎src/dal/models/nosql/parti_ql.ts

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -668,7 +668,7 @@ export const StringSet = {
668668
},
669669

670670
decode(input: _m0.Reader | Uint8Array, length?: number): StringSet {
671-
const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
671+
const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
672672
let end = length === undefined ? reader.len : reader.pos + length;
673673
const message = createBaseStringSet();
674674
while (reader.pos < end) {
@@ -725,7 +725,7 @@ export const NumberSet = {
725725
},
726726

727727
decode(input: _m0.Reader | Uint8Array, length?: number): NumberSet {
728-
const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
728+
const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
729729
let end = length === undefined ? reader.len : reader.pos + length;
730730
const message = createBaseNumberSet();
731731
while (reader.pos < end) {
@@ -813,7 +813,7 @@ export const Value = {
813813
},
814814

815815
decode(input: _m0.Reader | Uint8Array, length?: number): Value {
816-
const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
816+
const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
817817
let end = length === undefined ? reader.len : reader.pos + length;
818818
const message = createBaseValue();
819819
while (reader.pos < end) {
@@ -965,7 +965,7 @@ export const Attribute = {
965965
},
966966

967967
decode(input: _m0.Reader | Uint8Array, length?: number): Attribute {
968-
const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
968+
const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
969969
let end = length === undefined ? reader.len : reader.pos + length;
970970
const message = createBaseAttribute();
971971
while (reader.pos < end) {
@@ -1030,7 +1030,7 @@ export const Filter = {
10301030
},
10311031

10321032
decode(input: _m0.Reader | Uint8Array, length?: number): Filter {
1033-
const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
1033+
const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
10341034
let end = length === undefined ? reader.len : reader.pos + length;
10351035
const message = createBaseFilter();
10361036
while (reader.pos < end) {
@@ -1107,7 +1107,7 @@ export const SelectQuery = {
11071107
},
11081108

11091109
decode(input: _m0.Reader | Uint8Array, length?: number): SelectQuery {
1110-
const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
1110+
const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
11111111
let end = length === undefined ? reader.len : reader.pos + length;
11121112
const message = createBaseSelectQuery();
11131113
while (reader.pos < end) {
@@ -1195,7 +1195,7 @@ export const InsertQuery = {
11951195
},
11961196

11971197
decode(input: _m0.Reader | Uint8Array, length?: number): InsertQuery {
1198-
const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
1198+
const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
11991199
let end = length === undefined ? reader.len : reader.pos + length;
12001200
const message = createBaseInsertQuery();
12011201
while (reader.pos < end) {
@@ -1268,7 +1268,7 @@ export const UpdateOperation = {
12681268
},
12691269

12701270
decode(input: _m0.Reader | Uint8Array, length?: number): UpdateOperation {
1271-
const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
1271+
const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
12721272
let end = length === undefined ? reader.len : reader.pos + length;
12731273
const message = createBaseUpdateOperation();
12741274
while (reader.pos < end) {
@@ -1348,7 +1348,7 @@ export const UpdateQuery = {
13481348
},
13491349

13501350
decode(input: _m0.Reader | Uint8Array, length?: number): UpdateQuery {
1351-
const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
1351+
const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
13521352
let end = length === undefined ? reader.len : reader.pos + length;
13531353
const message = createBaseUpdateQuery();
13541354
while (reader.pos < end) {
@@ -1434,7 +1434,7 @@ export const DeleteQuery = {
14341434
},
14351435

14361436
decode(input: _m0.Reader | Uint8Array, length?: number): DeleteQuery {
1437-
const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
1437+
const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
14381438
let end = length === undefined ? reader.len : reader.pos + length;
14391439
const message = createBaseDeleteQuery();
14401440
while (reader.pos < end) {
@@ -1504,7 +1504,7 @@ export const ReadQuery = {
15041504
},
15051505

15061506
decode(input: _m0.Reader | Uint8Array, length?: number): ReadQuery {
1507-
const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
1507+
const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
15081508
let end = length === undefined ? reader.len : reader.pos + length;
15091509
const message = createBaseReadQuery();
15101510
while (reader.pos < end) {
@@ -1567,7 +1567,7 @@ export const WriteQuery = {
15671567
},
15681568

15691569
decode(input: _m0.Reader | Uint8Array, length?: number): WriteQuery {
1570-
const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
1570+
const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
15711571
let end = length === undefined ? reader.len : reader.pos + length;
15721572
const message = createBaseWriteQuery();
15731573
while (reader.pos < end) {
@@ -1645,7 +1645,7 @@ export const BulkWriteQuery = {
16451645
},
16461646

16471647
decode(input: _m0.Reader | Uint8Array, length?: number): BulkWriteQuery {
1648-
const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
1648+
const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
16491649
let end = length === undefined ? reader.len : reader.pos + length;
16501650
const message = createBaseBulkWriteQuery();
16511651
while (reader.pos < end) {
@@ -1705,7 +1705,7 @@ export const BulkQuery = {
17051705
},
17061706

17071707
decode(input: _m0.Reader | Uint8Array, length?: number): BulkQuery {
1708-
const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
1708+
const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
17091709
let end = length === undefined ? reader.len : reader.pos + length;
17101710
const message = createBaseBulkQuery();
17111711
while (reader.pos < end) {
@@ -1792,7 +1792,7 @@ export const Query = {
17921792
},
17931793

17941794
decode(input: _m0.Reader | Uint8Array, length?: number): Query {
1795-
const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
1795+
const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
17961796
let end = length === undefined ? reader.len : reader.pos + length;
17971797
const message = createBaseQuery();
17981798
while (reader.pos < end) {
@@ -1883,7 +1883,7 @@ export const Response = {
18831883
},
18841884

18851885
decode(input: _m0.Reader | Uint8Array, length?: number): Response {
1886-
const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
1886+
const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
18871887
let end = length === undefined ? reader.len : reader.pos + length;
18881888
const message = createBaseResponse();
18891889
while (reader.pos < end) {
@@ -1951,7 +1951,7 @@ export const QueryRequest = {
19511951
},
19521952

19531953
decode(input: _m0.Reader | Uint8Array, length?: number): QueryRequest {
1954-
const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
1954+
const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
19551955
let end = length === undefined ? reader.len : reader.pos + length;
19561956
const message = createBaseQueryRequest();
19571957
while (reader.pos < end) {
@@ -2019,7 +2019,7 @@ export const ResponseError = {
20192019
},
20202020

20212021
decode(input: _m0.Reader | Uint8Array, length?: number): ResponseError {
2022-
const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
2022+
const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
20232023
let end = length === undefined ? reader.len : reader.pos + length;
20242024
const message = createBaseResponseError();
20252025
while (reader.pos < end) {
@@ -2075,7 +2075,7 @@ export const QueryResponse = {
20752075
},
20762076

20772077
decode(input: _m0.Reader | Uint8Array, length?: number): QueryResponse {
2078-
const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
2078+
const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
20792079
let end = length === undefined ? reader.len : reader.pos + length;
20802080
const message = createBaseQueryResponse();
20812081
while (reader.pos < end) {

‎src/domain/Challenge.ts

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import {
2727
UpdateChallengeInputForACL_WinnerACL,
2828
UpdateChallengeInput_UpdateInput,
2929
} from "../models/domain-layer/challenge/challenge";
30-
import { CreateChallengeInput as LegacyCreateChallengeInput } from "../models/domain-layer/legacy/challenge";
3130
import { ChallengeSchema } from "../schema/Challenge";
3231

3332
import {
@@ -40,6 +39,7 @@ import {
4039
ResourceDomain as LegacyResourceDomain,
4140
ReviewDomain as LegacyReviewDomain,
4241
TermDomain as LegacyTermDomain,
42+
CreateChallengeInput as LegacyCreateChallengeInput,
4343
} from "@topcoder-framework/domain-acl";
4444
import _ from "lodash";
4545
import * as v5Api from "../api/v5Api";
@@ -609,7 +609,8 @@ class ChallengeDomain extends CoreOperations<Challenge, CreateChallengeInput> {
609609
const standardTerms = _.find(v5Terms, (e) => e.id === V5_TERMS_STANDARD_ID);
610610
const legacyStandardTerms: any = _.find(
611611
legacyTermsArray,
612-
(e: any) => _.toNumber(e.termsOfUseId) === _.toNumber(LEGACY_TERMS_STANDARD_ID)
612+
(e: any) =>
613+
_.toNumber(e.termsOfUseId) === _.toNumber(LEGACY_TERMS_STANDARD_ID)
613614
);
614615

615616
// console.log(`NDA: ${config.V5_TERMS_NDA_ID} - ${JSON.stringify(nda)}`)
@@ -870,7 +871,9 @@ class ChallengeDomain extends CoreOperations<Challenge, CreateChallengeInput> {
870871
value: amount,
871872
});
872873
} else {
873-
console.log(`Creating copilot payment: ${amount}... with project id: ${legacyChallengeId} and project info type id: ${ProjectInfoIds.CopilotPayment}...`)
874+
console.log(
875+
`Creating copilot payment: ${amount}... with project id: ${legacyChallengeId} and project info type id: ${ProjectInfoIds.CopilotPayment}...`
876+
);
874877
try {
875878
await legacyProjectInfoDomain.create({
876879
projectId: legacyChallengeId,
@@ -920,13 +923,14 @@ class ChallengeDomain extends CoreOperations<Challenge, CreateChallengeInput> {
920923
const createdByUserId = 22838965; // TODO: Extract from interceptors
921924
const updatedByUserId = 22838965; // TODO: Extract from interceptors
922925

923-
924926
// Make sure legacyId is there or status is New before we do anything in legacy
925927
if (!input?.legacyId) {
926928
const { items } = await super.scan(scanCriteria, undefined);
927929
const [existing] = items;
928930
if (existing.status !== ChallengeStatuses.New) {
929-
throw new Error(`Cannot update ${input?.id}. Missing legacyId and challenge is not in New status`);
931+
throw new Error(
932+
`Cannot update ${input?.id}. Missing legacyId and challenge is not in New status`
933+
);
930934
}
931935
}
932936

@@ -993,7 +997,11 @@ class ChallengeDomain extends CoreOperations<Challenge, CreateChallengeInput> {
993997
// associateChallengeTerms
994998
await this.associateChallengeTerms(input.terms, legacyId);
995999
// setCopilotPayment
996-
await this.setCopilotPayment(input.id, legacyId, _.get(input, "prizeSets"));
1000+
await this.setCopilotPayment(
1001+
input.id,
1002+
legacyId,
1003+
_.get(input, "prizeSets")
1004+
);
9971005

9981006
// If iterative review is open
9991007
if (
@@ -1012,7 +1020,10 @@ class ChallengeDomain extends CoreOperations<Challenge, CreateChallengeInput> {
10121020
input.metadata,
10131021
(meta) => meta.name === "or_review_score"
10141022
);
1015-
if (!_.isUndefined(orReviewFeedback) && !_.isUndefined(orReviewScore)) {
1023+
if (
1024+
!_.isUndefined(orReviewFeedback) &&
1025+
!_.isUndefined(orReviewScore)
1026+
) {
10161027
orReviewFeedback = JSON.parse(_.toString(orReviewFeedback));
10171028
const reviewResponses: any[] = [];
10181029
_.each(orReviewFeedback, (value, key) => {

‎src/models/common/common.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ export const ScanCriteria = {
250250
},
251251

252252
decode(input: _m0.Reader | Uint8Array, length?: number): ScanCriteria {
253-
const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
253+
const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
254254
let end = length === undefined ? reader.len : reader.pos + length;
255255
const message = createBaseScanCriteria();
256256
while (reader.pos < end) {
@@ -319,7 +319,7 @@ export const ScanRequest = {
319319
},
320320

321321
decode(input: _m0.Reader | Uint8Array, length?: number): ScanRequest {
322-
const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
322+
const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
323323
let end = length === undefined ? reader.len : reader.pos + length;
324324
const message = createBaseScanRequest();
325325
while (reader.pos < end) {
@@ -385,7 +385,7 @@ export const ScanResult = {
385385
},
386386

387387
decode(input: _m0.Reader | Uint8Array, length?: number): ScanResult {
388-
const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
388+
const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
389389
let end = length === undefined ? reader.len : reader.pos + length;
390390
const message = createBaseScanResult();
391391
while (reader.pos < end) {
@@ -453,7 +453,7 @@ export const CreateResult = {
453453
},
454454

455455
decode(input: _m0.Reader | Uint8Array, length?: number): CreateResult {
456-
const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
456+
const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
457457
let end = length === undefined ? reader.len : reader.pos + length;
458458
const message = createBaseCreateResult();
459459
while (reader.pos < end) {
@@ -522,7 +522,7 @@ export const UpdateResult = {
522522
},
523523

524524
decode(input: _m0.Reader | Uint8Array, length?: number): UpdateResult {
525-
const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
525+
const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
526526
let end = length === undefined ? reader.len : reader.pos + length;
527527
const message = createBaseUpdateResult();
528528
while (reader.pos < end) {
@@ -581,7 +581,7 @@ export const CheckExistsResult = {
581581
},
582582

583583
decode(input: _m0.Reader | Uint8Array, length?: number): CheckExistsResult {
584-
const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
584+
const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
585585
let end = length === undefined ? reader.len : reader.pos + length;
586586
const message = createBaseCheckExistsResult();
587587
while (reader.pos < end) {
@@ -635,7 +635,7 @@ export const LookupCriteria = {
635635
},
636636

637637
decode(input: _m0.Reader | Uint8Array, length?: number): LookupCriteria {
638-
const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
638+
const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
639639
let end = length === undefined ? reader.len : reader.pos + length;
640640
const message = createBaseLookupCriteria();
641641
while (reader.pos < end) {
@@ -694,7 +694,7 @@ export const GoogleProtobufTypesPlaceholder = {
694694
},
695695

696696
decode(input: _m0.Reader | Uint8Array, length?: number): GoogleProtobufTypesPlaceholder {
697-
const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
697+
const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
698698
let end = length === undefined ? reader.len : reader.pos + length;
699699
const message = createBaseGoogleProtobufTypesPlaceholder();
700700
while (reader.pos < end) {

0 commit comments

Comments
 (0)