Skip to content

Commit

Permalink
fix all lint errors
Browse files Browse the repository at this point in the history
  • Loading branch information
eshaham committed Jun 24, 2018
1 parent 1393ce5 commit 95c38ee
Show file tree
Hide file tree
Showing 7 changed files with 44 additions and 23 deletions.
3 changes: 2 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
"ForInStatement",
"LabeledStatement",
"WithStatement",
]
],
"operator-linebreak": ["error", "after"]
},
"globals": {
"document": true,
Expand Down
1 change: 0 additions & 1 deletion playground/setup-options.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,3 @@ export default async function () {

console.log('playground options saved, to start scraping run "npm start"');
}

7 changes: 6 additions & 1 deletion src/helpers/elements-interactions.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,9 @@ async function dropdownSelect(page, selectSelector, value) {
await page.select(selectSelector, value);
}

export { waitUntilElementFound, fillInput, clickButton, dropdownSelect };
export {
waitUntilElementFound,
fillInput,
clickButton,
dropdownSelect,
};
10 changes: 9 additions & 1 deletion src/scrapers/base-isracard-amex.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,15 @@ import moment from 'moment';

import { BaseScraperWithBrowser, LOGIN_RESULT } from './base-scraper-with-browser';
import { fetchGetWithinPage, fetchPostWithinPage } from '../helpers/fetch';
import { SCRAPE_PROGRESS_TYPES, NORMAL_TXN_TYPE, INSTALLMENTS_TXN_TYPE, SHEKEL_CURRENCY_KEYWORD, SHEKEL_CURRENCY, ALT_SHEKEL_CURRENCY, TRANSACTION_STATUS } from '../constants';
import {
SCRAPE_PROGRESS_TYPES,
NORMAL_TXN_TYPE,
INSTALLMENTS_TXN_TYPE,
SHEKEL_CURRENCY_KEYWORD,
SHEKEL_CURRENCY,
ALT_SHEKEL_CURRENCY,
TRANSACTION_STATUS,
} from '../constants';
import getAllMonthMoments from '../helpers/dates';
import { fixInstallments, filterOldTransactions } from '../helpers/transactions';

Expand Down
8 changes: 7 additions & 1 deletion src/scrapers/leumi-card.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@ import moment from 'moment';
import { BaseScraperWithBrowser, LOGIN_RESULT } from './base-scraper-with-browser';
import { waitForNavigationAndDomLoad, waitForRedirect } from '../helpers/navigation';
import { waitUntilElementFound } from '../helpers/elements-interactions';
import { NORMAL_TXN_TYPE, INSTALLMENTS_TXN_TYPE, SHEKEL_CURRENCY_SYMBOL, SHEKEL_CURRENCY, TRANSACTION_STATUS } from '../constants';
import {
NORMAL_TXN_TYPE,
INSTALLMENTS_TXN_TYPE,
SHEKEL_CURRENCY_SYMBOL,
SHEKEL_CURRENCY,
TRANSACTION_STATUS,
} from '../constants';
import getAllMonthMoments from '../helpers/dates';
import { fixInstallments, sortTransactionsByDate, filterOldTransactions } from '../helpers/transactions';

Expand Down
28 changes: 15 additions & 13 deletions src/scrapers/leumi.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
import moment from 'moment';
import { BaseScraperWithBrowser, LOGIN_RESULT } from './base-scraper-with-browser';
import { dropdownSelect, fillInput, clickButton, waitUntilElementFound } from '../helpers/elements-interactions';
import {
dropdownSelect,
fillInput,
clickButton,
waitUntilElementFound,
} from '../helpers/elements-interactions';
import { waitForNavigation } from '../helpers/navigation';
import { SHEKEL_CURRENCY, NORMAL_TXN_TYPE, TRANSACTION_STATUS } from '../constants';

Expand Down Expand Up @@ -63,20 +68,18 @@ async function extractCompletedTransactionsFromPage(page) {
const txns = [];

const tdsValues = await page.$$eval('#WorkSpaceBox #ctlActivityTable tr td', (tds) => {
return tds.map(td =>
({
classList: td.getAttribute('class'),
innerText: td.innerText,
}));
return tds.map(td => ({
classList: td.getAttribute('class'),
innerText: td.innerText,
}));
});

for (const element of tdsValues) {
if (element.classList.includes('ExtendedActivityColumnDate')) {
const newTransaction = { status: TRANSACTION_STATUS.COMPLETED };
newTransaction.date = (element.innerText || '').trim();
txns.push(newTransaction);
} else if (element.classList.includes('ActivityTableColumn1LTR')
|| element.classList.includes('ActivityTableColumn1')) {
} else if (element.classList.includes('ActivityTableColumn1LTR') || element.classList.includes('ActivityTableColumn1')) {
const changedTransaction = txns.pop();
changedTransaction.description = element.innerText;
txns.push(changedTransaction);
Expand Down Expand Up @@ -110,11 +113,10 @@ async function extractPendingTransactionsFromPage(page) {
const txns = [];

const tdsValues = await page.$$eval('#WorkSpaceBox #trTodayActivityNapaTableUpper tr td', (tds) => {
return tds.map(td =>
({
classList: td.getAttribute('class'),
innerText: td.innerText,
}));
return tds.map(td => ({
classList: td.getAttribute('class'),
innerText: td.innerText,
}));
});

for (const element of tdsValues) {
Expand Down
10 changes: 5 additions & 5 deletions src/scrapers/otsar-hahayal.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,10 @@ function convertTransactions(txns) {

async function parseTransactionPage(page) {
const tdsValues = await page.$$eval('#dataTable077 tbody tr td', (tds) => {
return tds.map(td =>
({
classList: td.getAttribute('class'),
innerText: td.innerText,
}));
return tds.map(td => ({
classList: td.getAttribute('class'),
innerText: td.innerText,
}));
});

const txns = [];
Expand Down Expand Up @@ -194,6 +193,7 @@ class OtsarHahayalScraper extends BaseScraperWithBrowser {
possibleResults: getPossibleLoginResults(),
};
}

async fetchData() {
const defaultStartMoment = moment().subtract(1, 'years').add(1, 'day');
const startDate = this.options.startDate || defaultStartMoment.toDate();
Expand Down

0 comments on commit 95c38ee

Please sign in to comment.