Skip to content

Commit 9cb8adf

Browse files
committed
fix integration tests, remove old billing
1 parent 146ce49 commit 9cb8adf

File tree

10 files changed

+55
-343
lines changed

10 files changed

+55
-343
lines changed

.env.sample

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,6 @@ PLAYGROUND_ENABLE=false
3535
# AMQP URL
3636
AMQP_URL=amqp://guest:guest@rabbitmq
3737

38-
# Billing settings
39-
BILLING_DEBUG=true
40-
BILLING_COMPANY_EMAIL="[email protected]"
41-
4238
### Accounting module ###
4339
# Accounting service URL
4440
# CODEX_ACCOUNTING_URL=http://accounting:3999/graphql

.env.test

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,6 @@ SMTP_SENDER_ADDRESS=
4646
# AMQP URL
4747
AMQP_URL=amqp://guest:guest@rabbitmq:5672/
4848

49-
# Billing settings
50-
BILLING_DEBUG=true
51-
BILLING_COMPANY_EMAIL="[email protected]"
52-
5349
### Accounting module ###
5450
# Accounting service URL
5551
# CODEX_ACCOUNTING_URL=

src/models/paymentRequest.js

Lines changed: 0 additions & 86 deletions
This file was deleted.

src/models/paymentTransaction.js

Lines changed: 0 additions & 55 deletions
This file was deleted.

src/models/projectToWorkspace.js

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,17 +69,12 @@ class ProjectToWorkspace {
6969
* Creates new projects:<workspace._id> document
7070
*
7171
* @param {{projectId: ObjectId}} projectToWorkspaceData
72-
* @returns {Promise<Object>}
72+
* @returns {Promise<boolean>}
7373
*/
7474
async add(projectToWorkspaceData) {
75-
const projectToWorkspace = await this.collection.insertOne(
76-
projectToWorkspaceData
77-
);
75+
const projectToWorkspaceResult = await this.collection.insertOne(projectToWorkspaceData);
7876

79-
return {
80-
id: projectToWorkspace.insertedId,
81-
...projectToWorkspace,
82-
};
77+
return projectToWorkspaceResult.acknowledged;
8378
}
8479

8580
/**

src/models/userCard.js

Lines changed: 0 additions & 85 deletions
This file was deleted.

src/models/workspace.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ export default class WorkspaceModel extends AbstractModel<WorkspaceDBScheme> imp
5252

5353
/**
5454
* Workspace balance
55+
* @deprecated NOT USED
5556
*/
5657
public balance!: number;
5758

src/resolvers/billing.js

Lines changed: 0 additions & 75 deletions
This file was deleted.

test/integration/api.env

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,6 @@ SMTP_SENDER_ADDRESS=
5353
# AMQP URL
5454
AMQP_URL=amqp://guest:guest@rabbitmq:5672/
5555

56-
# Billing settings
57-
BILLING_DEBUG=true
58-
BILLING_COMPANY_EMAIL="[email protected]"
59-
6056
### Accounting module ###
6157
# Accounting service URL
6258
CODEX_ACCOUNTING_URL=http://accounting:3999/graphql

0 commit comments

Comments
 (0)