Skip to content
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

Issue 579 fix unit testing #593

Merged
merged 10 commits into from
Oct 18, 2024
Merged

Issue 579 fix unit testing #593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
037acfc
Add tests for bot/validations.js
Sep 24, 2024
8d469be
Remove only
Sep 24, 2024
eb9ff0e
Update bot tests and lightning tests
Sep 25, 2024
d2d8ddd
Update describe name
Sep 25, 2024
8dccdd9
Update files to pass the linter check
Sep 25, 2024
070a6c8
Merge with main
Sep 26, 2024
ba35c93
Fix merge conflicts and fix tests
Oct 2, 2024
34b4391
Adde stubs for dependencies and added some new tests
Oct 16, 2024
c82b5e7
Merge branch 'main' into issue-579_fix-unit-testing
Oct 16, 2024
d1bd9af
Fix lint issues
Oct 16, 2024
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
20 changes: 7 additions & 13 deletions bot/validations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { MainContext, OrderQuery, ctxUpdateAssertMsg } from "./start";
import { ICommunity } from "../models/community";
import { ICommunity, IUsernameId } from "../models/community";
import { FilterQuery } from "mongoose";
import { UserDocument } from "../models/user";
import { IOrder } from "../models/order";
Expand All @@ -9,7 +9,7 @@ const { parsePaymentRequest } = require('invoices');
const { ObjectId } = require('mongoose').Types;
import * as messages from './messages';
import { Order, User, Community } from '../models';
import { isIso4217, isDisputeSolver, removeLightningPrefix } from '../util';
import { isIso4217, isDisputeSolver, removeLightningPrefix, isOrderCreator } from '../util';
const { existLightningAddress } = require('../lnurl/lnurl-pay');
import { logger } from '../logger';

Expand Down Expand Up @@ -106,6 +106,7 @@ const validateAdmin = async (ctx: MainContext, id?: string) => {

const isSolver = isDisputeSolver(community, user);

// TODO this validation does not return anything
if (!user.admin && !isSolver)
return await messages.notAuthorized(ctx, tgUserId);

Expand Down Expand Up @@ -192,7 +193,8 @@ const validateSellOrder = async (ctx: MainContext) => {
await messages.mustBeANumberOrRange(ctx);
return false;
}


// TODO, this validation could be amount > 0?
if (amount !== 0 && amount < Number(process.env.MIN_PAYMENT_AMT)) {
await messages.mustBeGreatherEqThan(
ctx,
Expand Down Expand Up @@ -338,7 +340,7 @@ const validateInvoice = async (ctx: MainContext, lnInvoice: string) => {
const latestDate = new Date(
Date.now() + Number(process.env.INVOICE_EXPIRATION_WINDOW)
);
if (!("MAIN_PAYMENT_AMT" in process.env)) throw Error("MIN_PAYMENT_AMT not found, please check .env file");
if (!("MIN_PAYMENT_AMT" in process.env)) throw Error("MIN_PAYMENT_AMT not found, please check .env file");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@danfercf1 this looks like an unrelated change that should go in a separate PR?

Copy link
Contributor Author

@danfercf1 danfercf1 Oct 3, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, you are right the problem is that the test related to this implementation will not work. I've reported that problem in this issue #594

if (!!invoice.tokens && invoice.tokens < Number(process.env.MIN_PAYMENT_AMT)) {
await messages.minimunAmountInvoiceMessage(ctx);
return false;
Expand Down Expand Up @@ -429,14 +431,6 @@ const isValidInvoice = async (ctx: MainContext, lnInvoice: string) => {
}
};

const isOrderCreator = (user: UserDocument, order: IOrder) => {
try {
return user._id == order.creator_id;
} catch (error) {
logger.error(error);
return false;
}
};

const validateTakeSellOrder = async (ctx: MainContext, bot: Telegraf<MainContext>, user: UserDocument, order: IOrder) => {
try {
Expand Down Expand Up @@ -688,7 +682,7 @@ const isBannedFromCommunity = async (user: UserDocument, communityId: string) =>
if (!communityId) return false;
const community = await Community.findOne({ _id: communityId });
if (!community) return false;
return community.banned_users.toObject().some((buser: ICommunity) => buser.id == user._id);
return community.banned_users.some((buser: IUsernameId) => buser.id == user._id);
} catch (error) {
logger.error(error);
return false;
Expand Down
1,050 changes: 514 additions & 536 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"lint": "eslint .",
"format": "prettier --write '**/*.js'",
"pretest": "npx tsc",
"test": "export NODE_ENV=test && mocha --exit 'tests/**/*.js'"
"test": "export NODE_ENV=test && mocha --exit tests/**/*.spec.js"
},
"license": "MIT",
"dependencies": {
Expand Down
Loading
Loading