+ Invoice
+ ${renderContactDetails(receiver)}
+
+ Invoice: ${metadata.noInvoice}
+ Date: ${new Date(metadata.date).toLocaleDateString('be-BE')}
+
+
+
+
+ | Description |
+ Amount |
+
+
+
+ ${details
+ .map(
+ detail => `
+ | ${detail.description} |
+ € ${detail.amount} |
+
`
+ )
+ .join('')}
+
+
+
+
+ | Total excl. VAT |
+ € ${total} |
+
+
+ | VAT ${metadata.VAT}% |
+ € ${amountVAT} |
+
+
+ | Total |
+ € ${totalInclVAT} |
+
+
+
+ Please pay this invoice by bank transfer, clearly stating the invoice number, to our account ${
+ organization.iban
+ } within 30 days after date of invoice clearly.
+
+
+
+
+ `;
+ return new Promise((resolve, reject) => {
+ pdf.create(html, options).toStream((err, res) => {
+ if (err) return reject(err);
+ return resolve(res);
+ });
+ });
+};
diff --git a/backend/src/lib/validation.js b/backend/src/lib/validation.js
index de59635..ea2fe16 100644
--- a/backend/src/lib/validation.js
+++ b/backend/src/lib/validation.js
@@ -14,7 +14,7 @@ configure({
EXISTY_STRICT: true
});
-const MAX_LENGTH = 500;
+const MAX_LENGTH = process.env.STRING_MAX_CHAR || 500;
exports.validate = (data, rules, messages) => {
return new Promise((resolve, reject) => {
@@ -41,54 +41,102 @@ const minMessage = (field, validation, args) => {
const maxMessage = (field, validation, args) => TOO_LONG(field, args[0]);
const aboveMessage = (field, validation, args) => MUST_BE_ABOVE(field, args[0]);
+const addressValidation = {
+ rules: {
+ 'address.street': `required_with_any:address.city,address.country,address.zipCode|max:${MAX_LENGTH}`,
+ 'address.city': `required_with_any:address.street,address.country,address.zipCode|max:${MAX_LENGTH}`,
+ 'address.country': `required_with_any:address.street,address.city,address.zipCode|max:${MAX_LENGTH}`
+ },
+ messages: { required_with_any: requiredMessage, max: maxMessage }
+};
+
+const bankDetailsValidation = {
+ rules: {
+ 'bankDetails.bic': `requiredIf:bankDetails.iban|max:${MAX_LENGTH}`,
+ 'bankDetails.iban': `requiredIf:bankDetails.bic|max:${MAX_LENGTH}` // TODO change to IBAN format
+ },
+ messages: { requiredIf: requiredMessage, max: maxMessage }
+};
+
+const companyValidation = {
+ rules: {
+ 'company.name': `required|max:${MAX_LENGTH}`,
+ 'company.email': 'email',
+ 'company.phone': `max:${MAX_LENGTH}`, // TODO change to regex
+ 'company.VAT': `max:12`, // TODO change to regex ?
+ ...addressValidation.rules,
+ ...bankDetailsValidation.rules
+ },
+ messages: {
+ required: requiredMessage,
+ max: maxMessage,
+ email: WRONG_EMAIL_FORMAT,
+ ...bankDetailsValidation.messages,
+ ...addressValidation.messages
+ },
+ formatData: data => ({
+ ...data,
+ email: data.email === null ? undefined : data.email,
+ address: { ...data.address },
+ bankDetails: { ...data.bankDetails }
+ })
+};
+
+// module.exports = companyValidation;
+
+// const categoryValidation = {
+// rules: {
+// name: `required|max:${MAX_LENGTH}`
+// },
+// messages: {
+// required: requiredMessage
+// }
+// };
+
+// module.exports = categoryValidation;
+
exports.registerValidation = {
rules: {
email: 'email|required',
name: `required|max:${MAX_LENGTH}`,
password: `required|min:8|max:1000`,
- street: `required_with_any:city,country,zipCode|max:${MAX_LENGTH}`,
- city: `required_with_any:street,country,zipCode|max:${MAX_LENGTH}`,
- country: `required_with_any:street,city,zipCode|max:${MAX_LENGTH}`,
- bic: `requiredIf:iban|max:${MAX_LENGTH}`,
- iban: `requiredIf:bic|max:${MAX_LENGTH}` // TODO change to IBAN format
+ ...addressValidation.rules,
+ ...bankDetailsValidation.rules
},
messages: {
required: requiredMessage,
- requiredIf: requiredMessage,
- required_with_any: requiredMessage,
+ ...addressValidation.messages,
+ ...bankDetailsValidation.messages,
min: minMessage,
max: maxMessage,
- 'email.email': WRONG_EMAIL_FORMAT
+ email: WRONG_EMAIL_FORMAT
},
formatData: data => {
return {
email: data.email,
name: data.name,
password: data.password,
- ...data.address,
- ...data.bankDetails
+ bankDetails: { ...data.bankDetails },
+ address: { ...data.address }
};
}
};
exports.updateProfileValidation = {
rules: {
- email: 'min:1|email',
+ email: 'email',
name: `min:1|max:${MAX_LENGTH}`,
password: `min:8|max:1000`,
- street: `required_with_any:city,country,zipCode|max:${MAX_LENGTH}`,
- city: `required_with_any:street,country,zipCode|max:${MAX_LENGTH}`,
- country: `required_with_any:street,city,zipCode|max:${MAX_LENGTH}`,
- bic: `requiredIf:iban|max:${MAX_LENGTH}`,
- iban: `requiredIf:bic|max:${MAX_LENGTH}` // TODO change to IBAN format
+ ...addressValidation.rules,
+ ...bankDetailsValidation.rules
},
messages: {
required: requiredMessage,
- required_with_any: requiredMessage,
- requiredIf: requiredMessage,
min: minMessage,
max: maxMessage,
- 'email.email': WRONG_EMAIL_FORMAT
+ email: WRONG_EMAIL_FORMAT,
+ ...addressValidation.messages,
+ ...bankDetailsValidation.messages
},
formatData: data => {
const formattedData = {};
@@ -99,8 +147,7 @@ exports.updateProfileValidation = {
else formattedData.name = '';
if (data.password !== null) formattedData.password = data.password;
else formattedData.password = '';
-
- return { ...formattedData, ...data.bankDetails, ...data.address };
+ return { ...formattedData, bankDetails: { ...data.bankDetails }, address: { ...data.address } };
}
};
@@ -121,3 +168,44 @@ exports.expenseValidation = {
return { VAT: data.VAT, amount: data.amount, date: data.date, description: data.description };
}
};
+
+exports.uploadInvoiceValidation = {
+ rules: {
+ VAT: 'above:-1',
+ amount: 'above:-1',
+ date: 'date',
+ expDate: 'date',
+ ...companyValidation.rules,
+ 'company.name': `min:1|max:${MAX_LENGTH}`
+ },
+ messages: {
+ above: aboveMessage,
+ date: INVALID_DATE_FORMAT,
+ min: minMessage,
+ max: maxMessage,
+ ...companyValidation.messages
+ },
+ formatData: data => ({ ...data, company: companyValidation.formatData({ ...data.company }) })
+};
+
+exports.generateInvoiceValidation = {
+ rules: {
+ 'details.*.description': `required|max:${MAX_LENGTH}`,
+ 'details.*.amount': `above:-1|max:${MAX_LENGTH}`,
+ VAT: 'above:-1',
+ 'company.name': `required|max:${MAX_LENGTH}`,
+ 'company.address.street': `required|max:${MAX_LENGTH}`,
+ 'company.address.city': `required|max:${MAX_LENGTH}`,
+ 'company.address.zipCode': `required`,
+ 'company.address.country': `required|max:${MAX_LENGTH}`
+ },
+ messages: {
+ above: aboveMessage,
+ max: maxMessage,
+ required: requiredMessage
+ },
+ formatData: data => {
+ data.details = data.details.map(detail => ({ ...detail }));
+ return { ...data, details: [...data.details], company: data.company.toJSON() };
+ }
+};
diff --git a/backend/src/models/Category.js b/backend/src/models/Category.js
new file mode 100644
index 0000000..12b0c2e
--- /dev/null
+++ b/backend/src/models/Category.js
@@ -0,0 +1,12 @@
+const mongoose = require('mongoose');
+
+const { Schema } = mongoose;
+
+const categorySchema = new Schema({
+ name: {
+ type: String,
+ trim: true
+ }
+});
+
+module.exports = mongoose.model('Category', categorySchema);
diff --git a/backend/src/models/Company.js b/backend/src/models/Company.js
new file mode 100644
index 0000000..451a014
--- /dev/null
+++ b/backend/src/models/Company.js
@@ -0,0 +1,28 @@
+const mongoose = require('mongoose');
+const bankDetails = require('./bankDetails');
+const address = require('./address');
+
+const { Schema } = mongoose;
+
+const companySchema = new Schema({
+ name: {
+ type: String,
+ trim: true
+ },
+ email: {
+ type: String,
+ trim: true
+ },
+ phone: {
+ type: String,
+ trim: true
+ },
+ VAT: {
+ type: String,
+ trim: true
+ },
+ bankDetails,
+ address
+});
+
+module.exports = mongoose.model('Company', companySchema);
diff --git a/backend/src/models/Counter.js b/backend/src/models/Counter.js
new file mode 100644
index 0000000..2a335d3
--- /dev/null
+++ b/backend/src/models/Counter.js
@@ -0,0 +1,10 @@
+const mongoose = require('mongoose');
+
+const { Schema } = mongoose;
+
+const CounterSchema = new Schema({
+ _id: String,
+ sequence: Number
+});
+
+module.exports = mongoose.model('Counter', CounterSchema);
diff --git a/backend/src/models/Transaction.js b/backend/src/models/Transaction.js
index 03dcae9..4fe0353 100644
--- a/backend/src/models/Transaction.js
+++ b/backend/src/models/Transaction.js
@@ -11,10 +11,12 @@ const transactionSchema = new Schema({
type: String // should be ObjectId
},
company: {
- type: String // should be ObjectId
+ type: Schema.Types.ObjectId,
+ ref: 'Company'
},
category: {
- type: String // should be ObjectId
+ type: Schema.Types.ObjectId,
+ ref: 'Category'
},
user: {
type: Schema.Types.ObjectId,
@@ -46,7 +48,8 @@ const transactionSchema = new Schema({
type: {
type: String,
enum: ['EXPENSE', 'INVOICE']
- }
+ },
+ ref: String
});
module.exports = mongoose.model('Transaction', transactionSchema);
diff --git a/backend/src/models/user.js b/backend/src/models/User.js
similarity index 91%
rename from backend/src/models/user.js
rename to backend/src/models/User.js
index f9ce09e..dae711f 100644
--- a/backend/src/models/user.js
+++ b/backend/src/models/User.js
@@ -1,8 +1,8 @@
/* eslint-disable func-names */
const mongoose = require('mongoose');
const bcrypt = require('bcrypt');
-const Address = require('./address');
-const BankDetails = require('./bankDetails');
+const address = require('./address');
+const bankDetails = require('./bankDetails');
const { Schema } = mongoose;
@@ -20,8 +20,8 @@ const userSchema = new Schema({
trim: true,
lowercase: true
},
- address: Address,
- bankDetails: BankDetails,
+ address,
+ bankDetails,
expenses: [
{
type: Schema.Types.ObjectId,
diff --git a/backend/src/models/index.js b/backend/src/models/index.js
index 83b8087..d8ccd86 100644
--- a/backend/src/models/index.js
+++ b/backend/src/models/index.js
@@ -1,4 +1,7 @@
-const User = require('./user');
+const User = require('./User');
const Transaction = require('./Transaction');
+const Company = require('./Company');
+const Category = require('./Category');
+const Counter = require('./Counter');
-module.exports = { User, Transaction };
+module.exports = { User, Transaction, Company, Category, Counter };
diff --git a/backend/src/tests/__snapshots__/e2e.test.js.snap b/backend/src/tests/__snapshots__/e2e.test.js.snap
index ac4abd9..2bf1242 100644
--- a/backend/src/tests/__snapshots__/e2e.test.js.snap
+++ b/backend/src/tests/__snapshots__/e2e.test.js.snap
@@ -23,6 +23,52 @@ Object {
}
`;
+exports[`Server - e2e Expense claim requires authenticated user 1`] = `
+Object {
+ "data": null,
+ "errors": Array [
+ Object {
+ "extensions": Object {
+ "code": "UNAUTHENTICATED",
+ },
+ "locations": Array [
+ Object {
+ "column": 5,
+ "line": 3,
+ },
+ ],
+ "message": "You must be logged in.",
+ "path": Array [
+ "expenseClaim",
+ ],
+ },
+ ],
+}
+`;
+
+exports[`Server - e2e Generate invoice requires authenticated user 1`] = `
+Object {
+ "data": null,
+ "errors": Array [
+ Object {
+ "extensions": Object {
+ "code": "UNAUTHENTICATED",
+ },
+ "locations": Array [
+ Object {
+ "column": 3,
+ "line": 2,
+ },
+ ],
+ "message": "You must be logged in.",
+ "path": Array [
+ "generateInvoice",
+ ],
+ },
+ ],
+}
+`;
+
exports[`Server - e2e Login fails on incorrect email 1`] = `
Object {
"data": null,
@@ -155,9 +201,78 @@ exports[`Server - e2e Register succeeds & returns lower case email 1`] = `
Object {
"data": Object {
"register": Object {
+ "address": null,
+ "bankDetails": null,
"email": "test@email.com",
"name": "Test Test",
},
},
}
`;
+
+exports[`Server - e2e Register succeeds & saves address and bankDetails 1`] = `
+Object {
+ "data": Object {
+ "register": Object {
+ "address": Object {
+ "city": "My city",
+ "country": "My country",
+ "street": "My street",
+ "zipCode": 1000,
+ },
+ "bankDetails": Object {
+ "bic": "MY BIC",
+ "iban": "MY IBAN",
+ },
+ "email": "test1@gmail.com",
+ "name": "Test Test",
+ },
+ },
+}
+`;
+
+exports[`Server - e2e Update profile requires authenticated user 1`] = `
+Object {
+ "data": null,
+ "errors": Array [
+ Object {
+ "extensions": Object {
+ "code": "UNAUTHENTICATED",
+ },
+ "locations": Array [
+ Object {
+ "column": 3,
+ "line": 2,
+ },
+ ],
+ "message": "You must be logged in.",
+ "path": Array [
+ "updateProfile",
+ ],
+ },
+ ],
+}
+`;
+
+exports[`Server - e2e Uplaod invoice requires authenticated user 1`] = `
+Object {
+ "data": null,
+ "errors": Array [
+ Object {
+ "extensions": Object {
+ "code": "UNAUTHENTICATED",
+ },
+ "locations": Array [
+ Object {
+ "column": 5,
+ "line": 3,
+ },
+ ],
+ "message": "You must be logged in.",
+ "path": Array [
+ "uploadInvoice",
+ ],
+ },
+ ],
+}
+`;
diff --git a/backend/src/tests/__snapshots__/integration.test.js.snap b/backend/src/tests/__snapshots__/integration.test.js.snap
index b3fc3bb..5edb6e8 100644
--- a/backend/src/tests/__snapshots__/integration.test.js.snap
+++ b/backend/src/tests/__snapshots__/integration.test.js.snap
@@ -1,5 +1,34 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
+exports[`Authenticated user Generate invoice succeeds 1`] = `
+Object {
+ "data": Object {
+ "generateInvoice": Object {
+ "flow": "OUT",
+ "type": "INVOICE",
+ },
+ },
+ "errors": undefined,
+ "extensions": undefined,
+ "http": Object {
+ "headers": Headers {
+ Symbol(map): Object {},
+ },
+ },
+}
+`;
+
+exports[`Authenticated user Upload invoice succeeds 1`] = `
+Object {
+ "data": Object {
+ "uploadInvoice": Object {
+ "flow": "IN",
+ "type": "INVOICE",
+ },
+ },
+}
+`;
+
exports[`Authenticated user claims expenses succeeds 1`] = `
Object {
"data": Object {
diff --git a/backend/src/tests/__snapshots__/validations.test.js.snap b/backend/src/tests/__snapshots__/validations.test.js.snap
new file mode 100644
index 0000000..a8b1dbb
--- /dev/null
+++ b/backend/src/tests/__snapshots__/validations.test.js.snap
@@ -0,0 +1,44 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`GENERATE INVOICE VALIDATION fails max length exceeded 1`] = `
+Array [
+ Object {
+ "details.0.description": "[details.*.description] must have a maximum of 50 characters.",
+ },
+ Object {
+ "company.name": "[company.name] must have a maximum of 50 characters.",
+ },
+ Object {
+ "company.address.street": "[company.address.street] must have a maximum of 50 characters.",
+ },
+ Object {
+ "company.address.city": "[company.address.city] must have a maximum of 50 characters.",
+ },
+ Object {
+ "company.address.country": "[company.address.country] must have a maximum of 50 characters.",
+ },
+]
+`;
+
+exports[`GENERATE INVOICE VALIDATION fails on missing required fields 1`] = `
+Array [
+ Object {
+ "details.0.description": "[details.*.description] is required (cannot be empty)",
+ },
+ Object {
+ "company.name": "[company.name] is required (cannot be empty)",
+ },
+ Object {
+ "company.address.street": "[company.address.street] is required (cannot be empty)",
+ },
+ Object {
+ "company.address.city": "[company.address.city] is required (cannot be empty)",
+ },
+ Object {
+ "company.address.zipCode": "[company.address.zipCode] is required (cannot be empty)",
+ },
+ Object {
+ "company.address.country": "[company.address.country] is required (cannot be empty)",
+ },
+]
+`;
diff --git a/backend/src/tests/e2e.test.js b/backend/src/tests/e2e.test.js
index 5472a28..daaf91f 100644
--- a/backend/src/tests/e2e.test.js
+++ b/backend/src/tests/e2e.test.js
@@ -1,15 +1,29 @@
+/* eslint-disable no-unused-vars */
+const FormData = require('form-data');
+const fetch = require('node-fetch');
// import our production apollo-server instance
const { server, db } = require('../');
const { startTestServer, toPromise, populate, clean } = require('./utils');
-const { GET_ME, LOGIN_ME_IN, REGISTER, ALL_USERS } = require('./graphql/queryStrings');
+const {
+ GET_ME,
+ LOGIN_ME_IN,
+ REGISTER,
+ ALL_USERS,
+ UPDATE_PROFILE,
+ EXPENSE_CLAIM_WITHOUT_GQL,
+ INVOICE_UPLOAD_WITHOUT_GQL,
+ GENERATE_INVOICE
+} = require('./graphql/queryStrings');
const testUser = { user: { name: 'Test Test', email: 'tesT@email.com', password: 'testing0189' } };
+const bankDetails = { iban: 'MY IBAN', bic: 'MY BIC' };
+const address = { street: 'My street', city: 'My city', zipCode: 1000, country: 'My country' };
describe('Server - e2e', () => {
let stop;
let graphql;
-
+ let uri;
beforeAll(async () => {
await db.connect();
await populate();
@@ -26,6 +40,8 @@ describe('Server - e2e', () => {
stop = testServer.stop;
// eslint-disable-next-line prefer-destructuring
graphql = testServer.graphql;
+ // eslint-disable-next-line prefer-destructuring
+ uri = testServer.uri;
});
afterEach(async () => {
@@ -120,5 +136,104 @@ describe('Server - e2e', () => {
expect(res).toMatchSnapshot();
expect(res.data.register.email).toBe('test@email.com');
});
+
+ it('succeeds & saves address and bankDetails', async () => {
+ const res = await toPromise(
+ graphql({
+ query: REGISTER,
+ variables: {
+ user: {
+ ...testUser.user,
+ bankDetails,
+ address,
+ email: 'test1@gmail.com'
+ }
+ }
+ })
+ );
+ expect(res).toMatchSnapshot();
+ expect(res.data.register.bankDetails).toBeTruthy();
+ expect(res.data.register.address).toBeTruthy();
+ });
+ });
+
+ describe('Update profile', () => {
+ it('requires authenticated user', async () => {
+ const res = await toPromise(
+ graphql({
+ query: UPDATE_PROFILE,
+ variables: { user: {} }
+ })
+ );
+ expect(res).toMatchSnapshot();
+ });
+ });
+
+ describe('Expense claim', () => {
+ it('requires authenticated user', async () => {
+ // https://github.com/jaydenseric/graphql-upload/issues/125
+
+ const body = new FormData();
+
+ body.append(
+ 'operations',
+ JSON.stringify({
+ query: EXPENSE_CLAIM_WITHOUT_GQL,
+ variables: {
+ amount: 10,
+ description: 'Hello World!',
+ receipt: null
+ }
+ })
+ );
+ body.append('map', JSON.stringify({ '0': ['variables.receipt'] }));
+ body.append('0', 'a', { filename: 'a.pdf' });
+ let res = await fetch(uri, { method: 'POST', body });
+ res = await res.json();
+ expect(res).toMatchSnapshot();
+ });
+ });
+
+ describe('Uplaod invoice', () => {
+ it('requires authenticated user', async () => {
+ const body = new FormData();
+ body.append(
+ 'operations',
+ JSON.stringify({
+ query: INVOICE_UPLOAD_WITHOUT_GQL,
+ variables: {
+ amount: 10,
+ invoice: null
+ }
+ })
+ );
+ body.append('map', JSON.stringify({ '0': ['variables.invoice'] }));
+ body.append('0', 'a', { filename: 'a.pdf' });
+ let res = await fetch(uri, { method: 'POST', body });
+ res = await res.json();
+ expect(res).toMatchSnapshot();
+ });
+ });
+
+ describe('Generate invoice', () => {
+ it('requires authenticated user', async () => {
+ const res = await toPromise(
+ graphql({
+ query: GENERATE_INVOICE,
+ variables: {
+ invoice: {
+ VAT: 21,
+ company: {
+ name: 'MY SUPER COMP',
+ VAT: 'MY VAT',
+ address: { street: '', country: '', city: '', zipCode: 0 }
+ },
+ details: [{ description: '', amount: 200 }]
+ }
+ }
+ })
+ );
+ expect(res).toMatchSnapshot();
+ });
});
});
diff --git a/backend/src/tests/graphql/queryStrings.js b/backend/src/tests/graphql/queryStrings.js
index 6c5336d..5b36a9a 100644
--- a/backend/src/tests/graphql/queryStrings.js
+++ b/backend/src/tests/graphql/queryStrings.js
@@ -24,6 +24,35 @@ module.exports.REGISTER = gql`
register(user: $user) {
name
email
+ bankDetails {
+ iban
+ bic
+ }
+ address {
+ street
+ city
+ zipCode
+ country
+ }
+ }
+ }
+`;
+
+module.exports.UPDATE_PROFILE = gql`
+ mutation updateProfile($user: UserUpdateInput!) {
+ updateProfile(user: $user) {
+ name
+ email
+ bankDetails {
+ iban
+ bic
+ }
+ address {
+ street
+ city
+ zipCode
+ country
+ }
}
}
`;
@@ -66,3 +95,24 @@ module.exports.EXPENSE_CLAIM_WITHOUT_GQL = `
}
}
`;
+
+module.exports.INVOICE_UPLOAD_WITHOUT_GQL = `
+ mutation($amount: Float!, $invoice: Upload!) {
+ uploadInvoice(invoice: { amount: $amount, invoice: $invoice }) {
+ id
+ type
+ flow
+ }
+ }
+`;
+
+module.exports.GENERATE_INVOICE = gql`
+ mutation($invoice: GenerateInvoiceInput!) {
+ generateInvoice(invoice: $invoice) {
+ id
+ type
+ flow
+ ref
+ }
+ }
+`;
diff --git a/backend/src/tests/integration.test.js b/backend/src/tests/integration.test.js
index 0e5da75..ac6346a 100644
--- a/backend/src/tests/integration.test.js
+++ b/backend/src/tests/integration.test.js
@@ -3,7 +3,7 @@ const FormData = require('form-data');
const fetch = require('node-fetch');
const fs = require('fs');
const { auth } = require('./mocks/index');
-const { db, models, cloudinary } = require('../');
+const { db, models, cloudinary, validation, constants, generateInvoicePDF } = require('../');
const { constructTestServer, startTestServer, populate, clean } = require('./utils');
const {
@@ -11,10 +11,15 @@ const {
GET_ME,
REGISTER,
ALL_USERS,
- EXPENSE_CLAIM_WITHOUT_GQL
+ EXPENSE_CLAIM_WITHOUT_GQL,
+ UPDATE_PROFILE,
+ INVOICE_UPLOAD_WITHOUT_GQL,
+ GENERATE_INVOICE
} = require('./graphql/queryStrings');
const testUser = { user: { name: 'Test Test', email: 'test@email.com', password: 'testing0189' } };
+const bankDetails = { iban: 'MY IBAN', bic: 'MY BIC' };
+const address = { street: 'My street', city: 'My city', zipCode: 1000, country: 'My country' };
describe('Authenticated user', () => {
let loggedUser;
@@ -90,6 +95,150 @@ describe('Authenticated user', () => {
expect(res.data.users.length).toBeGreaterThanOrEqual(3);
});
+ describe('update profile', () => {
+ let server;
+ let user;
+ beforeAll(async () => {
+ // authenticate another user to avoid crash in other tests
+ user = await models.User.findByEmail('mitchell@gmail.com');
+ server = constructTestServer({
+ context: () => {
+ return { models, user, auth, db, validation };
+ }
+ });
+ });
+
+ it('updates address without overwriting others fields', async () => {
+ const { mutate } = createTestClient(server);
+ const res = await mutate({
+ mutation: UPDATE_PROFILE,
+ variables: { user: { address } }
+ });
+ expect(res.data.updateProfile.address).toEqual(address);
+ expect(res.data.updateProfile.email).toBeTruthy();
+ });
+
+ it('updates bank details without overwriting others fields', async () => {
+ const { mutate } = createTestClient(server);
+ const res = await mutate({
+ mutation: UPDATE_PROFILE,
+ variables: { user: { bankDetails } }
+ });
+ expect(res.data.updateProfile.bankDetails).toEqual(bankDetails);
+ expect(res.data.updateProfile.address).toEqual(address);
+ });
+
+ it('updates email without overwritting others fields', async () => {
+ const { mutate } = createTestClient(server);
+ const res = await mutate({
+ mutation: UPDATE_PROFILE,
+ variables: { user: { email: 'johnny@john.com' } }
+ });
+ expect(res.data.updateProfile.email).toEqual('johnny@john.com');
+ expect(res.data.updateProfile.address).toEqual(address);
+ });
+
+ it('fails if email already exists', async () => {
+ const { mutate } = createTestClient(server);
+ const res = await mutate({
+ mutation: UPDATE_PROFILE,
+ variables: { user: { email: 'johnny@john.com' } }
+ });
+ expect(res.errors).toBeTruthy();
+ });
+
+ it('updates name without overwritting others fields', async () => {
+ const { mutate } = createTestClient(server);
+ const res = await mutate({
+ mutation: UPDATE_PROFILE,
+ variables: { user: { name: 'Johnny John' } }
+ });
+ expect(res.data.updateProfile.name).toEqual('Johnny John');
+ expect(res.data.updateProfile.address).toEqual(address);
+ });
+
+ it('can update all the fields at once', async () => {
+ const addr = {
+ street: 'Next street',
+ city: 'Next city',
+ zipCode: 1001,
+ country: 'Next Country'
+ };
+ const bd = { iban: 'BE098483992', bic: 'BPTOZE223' };
+ const { mutate } = createTestClient(server);
+ const res = await mutate({
+ mutation: UPDATE_PROFILE,
+ variables: {
+ user: {
+ email: user.email,
+ name: user.name,
+ password: 'testing343',
+ address: addr,
+ bankDetails: bd
+ }
+ }
+ });
+ expect(res.data.updateProfile.name).toEqual(user.name);
+ expect(res.data.updateProfile.email).toEqual(user.email);
+ expect(res.data.updateProfile.address).toEqual(addr);
+ expect(res.data.updateProfile.bankDetails).toEqual(bd);
+ });
+ });
+
+ describe('Generate invoice', () => {
+ let server;
+ let stop;
+ beforeAll(() => {
+ server = constructTestServer({
+ context: () => {
+ return {
+ models,
+ user: loggedUser,
+ auth,
+ cloudinary,
+ db,
+ validation,
+ constants,
+ generateInvoicePDF
+ };
+ }
+ });
+ });
+
+ beforeEach(async () => {
+ const testServer = await startTestServer(server);
+ // eslint-disable-next-line prefer-destructuring
+ stop = testServer.stop;
+ });
+
+ afterEach(async () => {
+ stop();
+ });
+
+ it('succeeds', async () => {
+ const { mutate } = createTestClient(server);
+ const res = await mutate({
+ mutation: GENERATE_INVOICE,
+ variables: {
+ invoice: {
+ VAT: 21,
+ company: {
+ name: 'MY SUPER COMP',
+ VAT: 'MY VAT',
+ address
+ },
+ details: [{ description: 'My description', amount: 200 }]
+ }
+ }
+ });
+ expect(res.data.generateInvoice.id).toBeTruthy();
+ expect(res.data.generateInvoice.ref).toBeTruthy();
+ delete res.data.generateInvoice.id;
+ delete res.data.generateInvoice.ref;
+ expect(res).toMatchSnapshot();
+ });
+ });
+
describe('claims expenses', () => {
let uri;
let server;
@@ -97,7 +246,7 @@ describe('Authenticated user', () => {
beforeAll(() => {
server = constructTestServer({
context: () => {
- return { models, user: loggedUser, auth, cloudinary, db };
+ return { models, user: loggedUser, auth, cloudinary, db, validation, constants };
}
});
});
@@ -141,9 +290,60 @@ describe('Authenticated user', () => {
let res = await fetch(uri, { method: 'POST', body });
res = await res.json();
expect(res.data.expenseClaim.user.expenses.includes(res.data.expenseClaim.id)).toBeTruthy();
+ expect(res.data.expenseClaim.type).toBe(constants.TR_TYPE.EXPENSE);
+ expect(res.data.expenseClaim.flow).toBe(constants.TR_FLOW.IN);
delete res.data.expenseClaim.id;
delete res.data.expenseClaim.user.expenses;
expect(res).toMatchSnapshot();
});
});
+
+ describe('Upload invoice', () => {
+ let uri;
+ let server;
+ let stop;
+ beforeAll(() => {
+ server = constructTestServer({
+ context: () => {
+ return { models, user: loggedUser, auth, cloudinary, db, validation, constants };
+ }
+ });
+ });
+
+ beforeEach(async () => {
+ const testServer = await startTestServer(server);
+ // eslint-disable-next-line prefer-destructuring
+ stop = testServer.stop;
+ // eslint-disable-next-line prefer-destructuring
+ uri = testServer.uri;
+ });
+
+ afterEach(async () => {
+ stop();
+ });
+
+ it('succeeds', async () => {
+ const body = new FormData();
+ body.append(
+ 'operations',
+ JSON.stringify({
+ query: INVOICE_UPLOAD_WITHOUT_GQL,
+ variables: {
+ amount: 10,
+ invoice: null
+ }
+ })
+ );
+ body.append('map', JSON.stringify({ '0': ['variables.invoice'] }));
+ const file = fs.createReadStream(`${__dirname}/a.pdf`);
+ body.append('0', file);
+
+ let res = await fetch(uri, { method: 'POST', body });
+ res = await res.json();
+ expect(res.data.uploadInvoice.type).toBe(constants.TR_TYPE.INVOICE);
+ expect(res.data.uploadInvoice.flow).toBe(constants.TR_FLOW.IN);
+ delete res.data.uploadInvoice.id;
+ expect(res).toMatchSnapshot();
+ });
+ });
});
diff --git a/backend/src/tests/utils.js b/backend/src/tests/utils.js
index bb3b5c3..a21d16c 100644
--- a/backend/src/tests/utils.js
+++ b/backend/src/tests/utils.js
@@ -85,9 +85,11 @@ module.exports.startTestServer = startTestServer;
// clean database
const clean = async () => {
- const { User, Transaction } = models;
+ const { User, Transaction, Company, Counter } = models;
await User.deleteMany({});
await Transaction.deleteMany({});
+ await Company.deleteMany({});
+ await Counter.deleteMany({});
};
// populate database
diff --git a/backend/src/tests/validations.test.js b/backend/src/tests/validations.test.js
new file mode 100644
index 0000000..42f0d4b
--- /dev/null
+++ b/backend/src/tests/validations.test.js
@@ -0,0 +1,462 @@
+const { UserInputError } = require('apollo-server-express');
+const {
+ validation: {
+ registerValidation,
+ updateProfileValidation,
+ expenseValidation,
+ uploadInvoiceValidation,
+ generateInvoiceValidation,
+ validate
+ }
+} = require('../');
+
+/**
+ * Test of input validation module
+ *
+ * Notes:
+ * 1. GraphQL will detect undefined values and reject them
+ * 2. GraphQL won't allow null for Numbers (Int/Float)
+ * 3. GraphQL allows null value for strings
+ * 4. GraphQL will make sure required fields have values (but allows empty string)
+ */
+const address = {
+ street: 'My Street 31',
+ city: 'My City',
+ country: 'My Country',
+ zipCode: 1000
+};
+const bankDetails = {
+ iban: 'MY IBAN',
+ bic: 'MY BIC'
+};
+const FIFTYONECHARSSTR = 'QYE5TOXWrDbi0bSQDbM1KmKOljjR5SihgUJO7aDwkkjUJVJOzk6';
+
+const addressExceedingMaxLength = {
+ street: FIFTYONECHARSSTR,
+ city: FIFTYONECHARSSTR,
+ country: FIFTYONECHARSSTR,
+ zipCode: 1000
+};
+
+describe('EXPENSE CLAIM VALIDATION', () => {
+ const { messages, rules } = expenseValidation;
+ const expense = {
+ VAT: 21,
+ amount: 10,
+ date: Date.now(),
+ description: 'Hello World!'
+ };
+
+ it('will pass validation (minimum required fields)', async () => {
+ await validate({ description: expense.description, amount: expense.amount }, rules, messages);
+ });
+
+ it('will pass validation (all required fields)', async () => {
+ await validate(expense, rules, messages);
+ });
+
+ it('fails if description not set', async () => {
+ try {
+ // {} is equivalent to description = null
+ await validate({}, rules, messages);
+ expect(false).toBe(true);
+ } catch (error) {
+ if (error instanceof UserInputError) {
+ const err = JSON.parse(error.message);
+ expect(err[0].description).toBeTruthy();
+ } else throw error;
+ }
+ try {
+ await validate({ description: undefined }, rules, messages);
+ expect(false).toBe(true);
+ } catch (error) {
+ if (error instanceof UserInputError) {
+ const err = JSON.parse(error.message);
+ expect(err[0].description).toBeTruthy();
+ } else throw error;
+ }
+ try {
+ await validate({ description: '' }, rules, messages);
+ expect(false).toBe(true);
+ } catch (error) {
+ if (error instanceof UserInputError) {
+ const err = JSON.parse(error.message);
+ expect(err[0].description).toBeTruthy();
+ } else throw error;
+ }
+ });
+
+ it('fails on max length exceeded', async () => {
+ try {
+ await validate({ description: FIFTYONECHARSSTR }, rules, messages);
+ expect(false).toBe(true);
+ } catch (error) {
+ if (error instanceof UserInputError) {
+ const err = JSON.parse(error.message);
+ expect(err[0].description).toBeTruthy();
+ } else throw error;
+ }
+ });
+
+ it('fails on max length exceeded', async () => {
+ try {
+ await validate({ description: FIFTYONECHARSSTR }, rules, messages);
+ expect(false).toBe(true);
+ } catch (error) {
+ if (error instanceof UserInputError) {
+ const err = JSON.parse(error.message);
+ expect(err[0].description).toBeTruthy();
+ } else throw error;
+ }
+ });
+
+ it('fails on invalid date', async () => {
+ try {
+ await validate({ description: expense.description, date: 'fefle' }, rules, messages);
+ expect(false).toBe(true);
+ } catch (error) {
+ if (error instanceof UserInputError) {
+ const err = JSON.parse(error.message);
+ expect(err[0].date).toBeTruthy();
+ } else throw error;
+ }
+ });
+});
+describe('REGISTER VALIDATION', () => {
+ const { rules, messages } = registerValidation;
+ const user = {
+ email: 'test@mail.com',
+ name: 'Test Test',
+ password: 'azerty1234',
+ address,
+ bankDetails
+ };
+ it("doesn't throw (minimal config)", async () => {
+ const data = {
+ email: user.email,
+ name: user.name,
+ password: user.password
+ };
+
+ await validate(data, rules, messages);
+ });
+
+ it("doesn't throw (with address)", async () => {
+ const data = {
+ ...user,
+ bankDetails: {}
+ };
+ await validate(data, rules, messages);
+ });
+
+ it("doesn't throw (with bankDetails)", async () => {
+ const data = {
+ ...user,
+ address: {}
+ };
+ await validate(data, rules, messages);
+ });
+
+ it("doesn't throw (full config)", async () => {
+ const data = user;
+ await validate(data, rules, messages);
+ });
+
+ it('throws on missing required field', async () => {
+ const data = {};
+ try {
+ await validate(data, rules, messages);
+ expect(false).toBe(true);
+ } catch (error) {
+ if (error instanceof UserInputError) {
+ const err = JSON.parse(error.message);
+ expect(err[0].email).toBeTruthy();
+ expect(err[1].email).toBeTruthy();
+ expect(err[2].name).toBeTruthy();
+ expect(err[3].password).toBeTruthy();
+ } else throw error;
+ }
+ });
+
+ describe('throws if password is not matching requirements', () => {
+ it('throws if password less than minimal characters', async () => {
+ try {
+ await validate({ ...user, password: '1234567' }, rules, messages);
+ expect(false).toBe(true);
+ } catch (error) {
+ if (error instanceof UserInputError) expect(true).toBe(true);
+ else throw error;
+ }
+ });
+ });
+
+ it('throws if one of bankDetails field is missing while the other is present', async () => {
+ const data = {
+ ...user,
+ bankDetails: {
+ iban: 'MY IBAN'
+ }
+ };
+ try {
+ await validate(data, rules, messages);
+ } catch (error) {
+ if (error instanceof UserInputError) {
+ const err = JSON.parse(error.message);
+ expect(err[0]['bankDetails.bic']).toBeTruthy();
+ } else throw error;
+ }
+ try {
+ await validate({ ...data, bankDetails: { bic: 'MY BIC' } }, rules, messages);
+ expect(false).toBe(true);
+ } catch (error) {
+ if (error instanceof UserInputError) {
+ const err = JSON.parse(error.message);
+ expect(err[0]['bankDetails.iban']).toBeTruthy();
+ } else throw error;
+ }
+ });
+
+ it('throws if any of address fields are missing while one of them is present', async () => {
+ // street is present
+ try {
+ await validate({ ...user, address: { street: 'My street' } }, rules, messages);
+ expect(false).toBe(true);
+ } catch (error) {
+ if (error instanceof UserInputError) {
+ const err = JSON.parse(error.message);
+ expect(err).toHaveLength(2);
+ } else throw error;
+ }
+ // city is present
+ try {
+ await validate({ ...user, address: { city: 'My city' } }, rules, messages);
+ expect(false).toBe(true);
+ } catch (error) {
+ if (error instanceof UserInputError) {
+ const err = JSON.parse(error.message);
+ expect(err).toHaveLength(2);
+ } else throw error;
+ }
+ // zipCode is present
+ try {
+ await validate({ ...user, address: { zipCode: 1000 } }, rules, messages);
+ expect(false).toBe(true);
+ } catch (error) {
+ if (error instanceof UserInputError) {
+ const err = JSON.parse(error.message);
+ expect(err).toHaveLength(3);
+ } else throw error;
+ }
+ // country is present
+ try {
+ await validate({ ...user, address: { country: 'My country' } }, rules, messages);
+ expect(false).toBe(true);
+ } catch (error) {
+ if (error instanceof UserInputError) {
+ const err = JSON.parse(error.message);
+ expect(err).toHaveLength(2);
+ } else throw error;
+ }
+ });
+
+ it('throws when length over max', async () => {
+ const data = {
+ ...user,
+ name: FIFTYONECHARSSTR,
+ address: {
+ city: FIFTYONECHARSSTR,
+ country: FIFTYONECHARSSTR,
+ street: FIFTYONECHARSSTR
+ },
+ bankDetails: {
+ bic: FIFTYONECHARSSTR,
+ iban: FIFTYONECHARSSTR
+ }
+ };
+ try {
+ await validate(data, rules, messages);
+ expect(false).toBe(true);
+ } catch (error) {
+ if (error instanceof UserInputError) {
+ const err = JSON.parse(error.message);
+ expect(err).toHaveLength(6);
+ } else throw error;
+ }
+ });
+});
+describe('UPDATE PROFILE VALIDATION', () => {
+ // most cases have been tested in REGISTER VALIDATION
+ const { formatData, messages, rules } = updateProfileValidation;
+ it('does not require any field', async () => {
+ await validate(formatData({}), rules, messages);
+ });
+
+ it('throws on empty string', async () => {
+ try {
+ await validate(formatData({ email: '', name: '', password: '' }), rules, messages);
+ expect(false).toBe(true);
+ } catch (error) {
+ if (error instanceof UserInputError) {
+ const err = JSON.parse(error.message);
+ expect(err).toHaveLength(3);
+ } else throw error;
+ }
+ });
+
+ it('throws on null value', async () => {
+ try {
+ await validate(formatData({ email: null, name: null, password: null }), rules, messages);
+ expect(false).toBe(true);
+ } catch (error) {
+ if (error instanceof UserInputError) {
+ const err = JSON.parse(error.message);
+ expect(err).toHaveLength(3);
+ } else throw error;
+ }
+ });
+});
+describe('UPLOAD INVOICE VALIDATION', () => {
+ const { formatData, messages, rules } = uploadInvoiceValidation;
+ const invoice = {
+ company: {
+ address,
+ bankDetails,
+ name: 'OKBE',
+ VAT: 'BE0000000000',
+ phone: '0483473742'
+ },
+ phone: '0483473741',
+ VAT: 21,
+ amount: 10,
+ date: Date.now(),
+ expDate: Date.now()
+ };
+
+ it('passes validation with minial required fields', async () => {
+ await validate(formatData({}), rules, messages);
+ });
+
+ it('passes validation with full fields', async () => {
+ await validate(formatData(invoice), rules, messages);
+ });
+
+ it('fails on invalid date', async () => {
+ try {
+ await validate(formatData({ date: 'eeee', expDate: 'eeee' }), rules, messages);
+ expect(false).toBe(true);
+ } catch (error) {
+ if (error instanceof UserInputError) {
+ const err = JSON.parse(error.message);
+ expect(err).toHaveLength(2);
+ } else throw error;
+ }
+ });
+
+ it('fails on negative value', async () => {
+ try {
+ await validate(formatData({ amount: -1, VAT: -1 }), rules, messages);
+ expect(false).toBe(true);
+ } catch (error) {
+ if (error instanceof UserInputError) {
+ const err = JSON.parse(error.message);
+ expect(err).toHaveLength(2);
+ } else throw error;
+ }
+ });
+
+ // TODO make this describe a root
+ describe('COMPANY VALIDATION', () => {
+ // Address & BankDetails are tested in REGISTER VALIDATION
+ it('passes with minimal required fields', async () => {
+ await validate(formatData({ company: { name: 'OKBE' } }), rules, messages);
+ });
+ it('passes with full fields', async () => {
+ await validate(formatData({ company: invoice.company }), rules, messages);
+ });
+ it('fails on max length exceeded', async () => {
+ try {
+ await validate(
+ formatData({
+ company: {
+ name: FIFTYONECHARSSTR,
+ VAT: `${invoice.company.VAT}1`,
+ phone: FIFTYONECHARSSTR
+ }
+ }),
+ rules,
+ messages
+ );
+ expect(false).toBe(true);
+ } catch (error) {
+ if (error instanceof UserInputError) {
+ const err = JSON.parse(error.message);
+ expect(err).toHaveLength(3);
+ } else throw error;
+ }
+ });
+ });
+});
+
+describe('GENERATE INVOICE VALIDATION', () => {
+ const { messages, rules } = generateInvoiceValidation;
+ const invoice = {
+ VAT: 21,
+ company: {
+ name: 'MY SUPER COMP',
+ VAT: 'MY VAT',
+ address
+ },
+ details: [{ description: 'My description', amount: 200 }]
+ };
+ it('passes validation', async () => {
+ await validate(invoice, rules, messages);
+ });
+ it('fails on missing required fields', async () => {
+ try {
+ await validate({ details: [{}] }, rules, messages);
+ expect(false).toBe(true);
+ } catch (error) {
+ if (error instanceof UserInputError) {
+ expect(JSON.parse(error.message)).toMatchSnapshot();
+ } else throw error;
+ }
+ });
+ it('fails on negative value', async () => {
+ try {
+ await validate(
+ { ...invoice, VAT: -1, details: [{ description: 'My description', amount: -1 }] },
+ rules,
+ messages
+ );
+ expect(false).toBe(true);
+ } catch (error) {
+ if (error instanceof UserInputError) {
+ const message = JSON.parse(error.message);
+ expect(message[1].VAT).toBeTruthy();
+ expect(message[0]['details.0.amount']).toBeTruthy();
+ } else throw error;
+ }
+ });
+ it('fails max length exceeded', async () => {
+ try {
+ await validate(
+ {
+ VAT: 10,
+ details: [{ description: FIFTYONECHARSSTR, amount: 300 }],
+ company: {
+ name: FIFTYONECHARSSTR,
+ address: addressExceedingMaxLength,
+ VAT: FIFTYONECHARSSTR
+ }
+ },
+ rules,
+ messages
+ );
+ expect(false).toBe(true);
+ } catch (error) {
+ if (error instanceof UserInputError) {
+ expect(JSON.parse(error.message)).toMatchSnapshot();
+ } else throw error;
+ }
+ });
+});