Skip to content

fix: remove legacy models #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 18, 2023
Merged

fix: remove legacy models #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion bin/server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ const protoConfig = [
`--descriptor_set_out ${PROTO_REFLECTIONS}`,
`--proto_path ${PROTO_DIR} ${PROTO_DIR}/common/*.proto`,
`--proto_path ${PROTO_DIR} ${PROTO_DIR}/domain-layer/challenge/*.proto`,
`--proto_path ${PROTO_DIR} ${PROTO_DIR}/domain-layer/legacy/*.proto`,
`--proto_path ${PROTO_DIR} ${PROTO_DIR}/domain-layer/challenge/services/*.proto`,
];

Expand Down
8 changes: 4 additions & 4 deletions src/dal/models/nosql/google/protobuf/struct.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ export const Struct = {
},

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

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

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

decode(input: _m0.Reader | Uint8Array, length?: number): ListValue {
const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
let end = length === undefined ? reader.len : reader.pos + length;
const message = createBaseListValue();
while (reader.pos < end) {
Expand Down
38 changes: 19 additions & 19 deletions src/dal/models/nosql/parti_ql.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -668,7 +668,7 @@ export const StringSet = {
},

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

decode(input: _m0.Reader | Uint8Array, length?: number): QueryResponse {
const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
let end = length === undefined ? reader.len : reader.pos + length;
const message = createBaseQueryResponse();
while (reader.pos < end) {
Expand Down
25 changes: 18 additions & 7 deletions src/domain/Challenge.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import {
UpdateChallengeInputForACL_WinnerACL,
UpdateChallengeInput_UpdateInput,
} from "../models/domain-layer/challenge/challenge";
import { CreateChallengeInput as LegacyCreateChallengeInput } from "../models/domain-layer/legacy/challenge";
import { ChallengeSchema } from "../schema/Challenge";

import {
Expand All @@ -40,6 +39,7 @@ import {
ResourceDomain as LegacyResourceDomain,
ReviewDomain as LegacyReviewDomain,
TermDomain as LegacyTermDomain,
CreateChallengeInput as LegacyCreateChallengeInput,
} from "@topcoder-framework/domain-acl";
import _ from "lodash";
import * as v5Api from "../api/v5Api";
Expand Down Expand Up @@ -609,7 +609,8 @@ class ChallengeDomain extends CoreOperations<Challenge, CreateChallengeInput> {
const standardTerms = _.find(v5Terms, (e) => e.id === V5_TERMS_STANDARD_ID);
const legacyStandardTerms: any = _.find(
legacyTermsArray,
(e: any) => _.toNumber(e.termsOfUseId) === _.toNumber(LEGACY_TERMS_STANDARD_ID)
(e: any) =>
_.toNumber(e.termsOfUseId) === _.toNumber(LEGACY_TERMS_STANDARD_ID)
);

// console.log(`NDA: ${config.V5_TERMS_NDA_ID} - ${JSON.stringify(nda)}`)
Expand Down Expand Up @@ -870,7 +871,9 @@ class ChallengeDomain extends CoreOperations<Challenge, CreateChallengeInput> {
value: amount,
});
} else {
console.log(`Creating copilot payment: ${amount}... with project id: ${legacyChallengeId} and project info type id: ${ProjectInfoIds.CopilotPayment}...`)
console.log(
`Creating copilot payment: ${amount}... with project id: ${legacyChallengeId} and project info type id: ${ProjectInfoIds.CopilotPayment}...`
);
try {
await legacyProjectInfoDomain.create({
projectId: legacyChallengeId,
Expand Down Expand Up @@ -920,13 +923,14 @@ class ChallengeDomain extends CoreOperations<Challenge, CreateChallengeInput> {
const createdByUserId = 22838965; // TODO: Extract from interceptors
const updatedByUserId = 22838965; // TODO: Extract from interceptors


// Make sure legacyId is there or status is New before we do anything in legacy
if (!input?.legacyId) {
const { items } = await super.scan(scanCriteria, undefined);
const [existing] = items;
if (existing.status !== ChallengeStatuses.New) {
throw new Error(`Cannot update ${input?.id}. Missing legacyId and challenge is not in New status`);
throw new Error(
`Cannot update ${input?.id}. Missing legacyId and challenge is not in New status`
);
}
}

Expand Down Expand Up @@ -993,7 +997,11 @@ class ChallengeDomain extends CoreOperations<Challenge, CreateChallengeInput> {
// associateChallengeTerms
await this.associateChallengeTerms(input.terms, legacyId);
// setCopilotPayment
await this.setCopilotPayment(input.id, legacyId, _.get(input, "prizeSets"));
await this.setCopilotPayment(
input.id,
legacyId,
_.get(input, "prizeSets")
);

// If iterative review is open
if (
Expand All @@ -1012,7 +1020,10 @@ class ChallengeDomain extends CoreOperations<Challenge, CreateChallengeInput> {
input.metadata,
(meta) => meta.name === "or_review_score"
);
if (!_.isUndefined(orReviewFeedback) && !_.isUndefined(orReviewScore)) {
if (
!_.isUndefined(orReviewFeedback) &&
!_.isUndefined(orReviewScore)
) {
orReviewFeedback = JSON.parse(_.toString(orReviewFeedback));
const reviewResponses: any[] = [];
_.each(orReviewFeedback, (value, key) => {
Expand Down
16 changes: 8 additions & 8 deletions src/models/common/common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ export const ScanCriteria = {
},

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

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

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

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

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

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

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

decode(input: _m0.Reader | Uint8Array, length?: number): GoogleProtobufTypesPlaceholder {
const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
let end = length === undefined ? reader.len : reader.pos + length;
const message = createBaseGoogleProtobufTypesPlaceholder();
while (reader.pos < end) {
Expand Down
Loading