Merge pull request #38 from danutzcodrescu/feat/edit-invoice-offer-ex…

…pense

feat: edit invoices, expenses and offers

src/backend/entities/Base.entity.ts

@@ -12,7 +12,7 @@ import {
 @Entity()
 @ObjectType()
 export class Base extends BaseEntity {
-  @Field(type => ID)
+  @Field(() => ID)
   @PrimaryGeneratedColumn('uuid')
   readonly id: string;
 

src/backend/entities/Expense.entity.ts

@@ -58,6 +58,10 @@ export class Expense extends BaseEntity {
   @BeforeUpdate()
   updateDate() {
     this.updatedAt = format(new Date(), 'yyyy-mm-dd HH:MM:SS');
+    this.invoiceDate = format(
+      new Date(this.invoiceDate),
+      'yyyy-MM-dd HH:mm:SS',
+    );
   }
 
   @BeforeInsert()

src/backend/entities/Invoice.entity.ts

@@ -23,7 +23,7 @@ export class Invoice extends BaseEntity {
   invoiceDate: string;
 
   @Field()
-  @Column({ type: 'text', nullable: false })
+  @Column({ type: 'text', nullable: false, unique: true })
   invoiceNumber: string;
 
   @Field()
@@ -70,6 +70,10 @@ export class Invoice extends BaseEntity {
   @BeforeUpdate()
   updateDate() {
     this.updatedAt = format(new Date(), 'yyyy-mm-dd HH:MM:SS');
+    this.invoiceDate = format(
+      new Date(this.invoiceDate),
+      'yyyy-MM-dd HH:mm:SS',
+    );
   }
 
   @BeforeInsert()

src/backend/entities/Offer.entity.ts

@@ -1,6 +1,6 @@
 import { format } from 'date-fns';
 import { Field, ObjectType } from 'type-graphql';
-import { BeforeInsert, Column, Entity, ManyToOne } from 'typeorm';
+import { BeforeInsert, BeforeUpdate, Column, Entity, ManyToOne } from 'typeorm';
 import { Base } from './Base.entity';
 import { Client } from './Client.entity';
 import { Profile } from './Profile.entity';
@@ -53,8 +53,19 @@ export class Offer extends Base {
   @BeforeInsert()
   createDate() {
     this.createdAt = format(new Date(), 'yyyy-MM:dd HH:mm:SS');
+    console.log('created', this.createdAt);
     this.updatedAt = format(new Date(), 'yyyy-MM-dd HH:mm:SS');
+    console.log('update', this.updatedAt);
+    this.invoiceDate = format(
+      new Date(this.invoiceDate),
+      'yyyy-MM-dd HH:mm:SS',
+    );
+    this.validUntil = format(new Date(this.validUntil), 'yyyy-MM-dd HH:mm:SS');
+  }
 
+  @BeforeUpdate()
+  updateDate() {
+    this.updatedAt = format(new Date(), 'yyyy-mm-dd HH:MM:SS');
     this.invoiceDate = format(
       new Date(this.invoiceDate),
       'yyyy-MM-dd HH:mm:SS',

src/backend/entities/VatRule.entity.ts

@@ -1,21 +1,11 @@
 import { format } from 'date-fns';
-import { Field, ID, ObjectType } from 'type-graphql';
-import {
-  BaseEntity,
-  BeforeInsert,
-  BeforeUpdate,
-  Column,
-  Entity,
-  PrimaryGeneratedColumn,
-} from 'typeorm';
+import { Field, ObjectType } from 'type-graphql';
+import { BeforeInsert, BeforeUpdate, Column, Entity } from 'typeorm';
+import { Base } from './Base.entity';
 
 @Entity()
 @ObjectType()
-export class VatRule extends BaseEntity {
-  @Field(type => ID)
-  @PrimaryGeneratedColumn('uuid')
-  readonly id: string;
-
+export class VatRule extends Base {
   @Field()
   @Column()
   name: string;

src/backend/resolvers/expense.resolver.ts

@@ -11,6 +11,7 @@ import { EntityManager } from 'typeorm';
 import { InjectManager } from 'typeorm-typedi-extensions';
 import { Expense } from '../entities/Expense.entity';
 import { setParams } from '../utils/helpers';
+import { ExpenseUpdate } from './types/arguments.helpers';
 import { CreateExpense } from './types/operations.helpers';
 
 @Resolver(Expense)
@@ -27,6 +28,10 @@ export class ExpenseResolver {
     // @ts-ignore
     return this.entityManager.find(Expense, params);
   }
+  @Query(() => Expense)
+  getExpense(@Arg('id', () => ID) id: string) {
+    return this.entityManager.findOne(Expense, id);
+  }
 
   @Mutation(() => Expense)
   async createExpense(
@@ -40,6 +45,16 @@ export class ExpenseResolver {
     await this.entityManager.delete(Expense, id);
     return true;
   }
+  @Mutation(() => Expense)
+  async updateExpense(@Arg('data') data: ExpenseUpdate) {
+    await this.entityManager
+      .createQueryBuilder()
+      .update(Expense)
+      .set(data)
+      .where({ id: data.id })
+      .execute();
+    return this.entityManager.findOne(data.id);
+  }
 
   @FieldResolver(() => String)
   invoiceDate(@Root() expense: Expense) {

src/backend/resolvers/invoices.resolver.ts

@@ -14,6 +14,7 @@ import { Invoice, Item } from '../entities/Invoice.entity';
 import { Profile, ProfileData } from '../entities/Profile.entity';
 import { setParams } from '../utils/helpers';
 import { getInvoiceNumber } from '../utils/invoices';
+import { InvoiceUpdate } from './types/arguments.helpers';
 import {
   ClientInput,
   InvoiceInput,
@@ -52,6 +53,11 @@ export class InvoiceResolver {
     );
   }
 
+  @Query(() => Invoice)
+  async getInvoice(@Arg('id', () => ID) id: string) {
+    return this.entityManager.findOne(Invoice, id);
+  }
+
   @Mutation(() => Invoice)
   async createInvoice(
     @Arg('client') client: ClientInput,
@@ -65,7 +71,7 @@ export class InvoiceResolver {
     const clientDB = await this.entityManager.findOne(Client, client.clientId);
     // @ts-ignore
     const invoice = this.entityManager.create(Invoice, {
-      createDate: invoiceData.invoiceDate,
+      invoiceDate: invoiceData.invoiceDate,
       amount: invoiceData.amount,
       vat: invoiceData.vat,
       items: invoiceData.items,
@@ -80,6 +86,33 @@ export class InvoiceResolver {
     return inv;
   }
 
+  @Mutation(() => Invoice)
+  async updateInvoice(@Arg('data') data: InvoiceUpdate) {
+    const [currentProfile, clientDB] = await Promise.all([
+      this.entityManager.findOne(Profile, data.profileId),
+      this.entityManager.findOne(Client, data.clientId),
+    ]);
+    // @ts-ignore
+    await this.entityManager
+      .createQueryBuilder()
+      .update(Invoice)
+      .set({
+        invoiceDate: data.invoiceDate,
+        amount: data.amount,
+        vat: data.vat,
+        items: data.items,
+        profileId: currentProfile?.id,
+        profileData: data.profileData,
+        clientId: clientDB?.id,
+        clientData: data.clientData,
+        vatRuleName: data.vatRuleName,
+        invoiceNumber: data.invoiceNumber,
+      })
+      .where({ id: data.id })
+      .execute();
+    return this.entityManager.findOne(Invoice, data.id);
+  }
+
   @Mutation(() => Boolean)
   async deleteInvoice(@Arg('id', (type) => ID) id: string) {
     await this.entityManager.delete(Invoice, id);

src/backend/resolvers/offers.resolver.ts

@@ -17,7 +17,7 @@ import { Offer } from '../entities/Offer.entity';
 import { Profile, ProfileData } from '../entities/Profile.entity';
 import { setParams } from '../utils/helpers';
 import { getInvoiceNumber } from '../utils/invoices';
-import { OfferInsert } from './types/arguments.helpers';
+import { OfferInsert, OfferUpdate } from './types/arguments.helpers';
 
 @Resolver(Offer)
 export class OfferResolver {
@@ -39,6 +39,11 @@ export class OfferResolver {
     return this.entityManager.find(Offer, params);
   }
 
+  @Query(() => Offer)
+  async getOffer(@Arg('id', () => ID) id: string) {
+    return this.entityManager.findOne(Offer, id);
+  }
+
   @Mutation(() => Offer)
   async insertOffer(@Arg('objet') obj: OfferInsert): Promise<Offer> {
     const currentProfile = await this.entityManager.findOne(
@@ -104,6 +109,35 @@ export class OfferResolver {
     return true;
   }
 
+  @Mutation(() => Offer)
+  async updateOffer(@Arg('data') data: OfferUpdate) {
+    const [currentProfile, clientDB] = await Promise.all([
+      this.entityManager.findOne(Profile, data.profileId),
+      data.clientId
+        ? this.entityManager.findOne(Client, data.clientId)
+        : undefined,
+    ]);
+    // @ts-ignore
+    await this.entityManager
+      .createQueryBuilder()
+      .update(Offer)
+      .set({
+        invoiceDate: data.invoiceDate,
+        amount: data.amount,
+        vat: data.vat,
+        items: data.items,
+        profileId: currentProfile?.id,
+        profileData: data.profileData,
+        clientId: clientDB?.id,
+        clientData: data.clientData,
+        vatRuleName: data.vatRuleName,
+        validUntil: data.validUntil,
+      })
+      .where({ id: data.id })
+      .execute();
+    return this.entityManager.findOne(Offer, data.id);
+  }
+
   @FieldResolver(() => ClientData)
   clientData(@Root() offer: Offer) {
     return JSON.parse(offer.clientData);

src/backend/resolvers/types/arguments.helpers.ts

@@ -1,4 +1,6 @@
 import { Field, InputType } from 'type-graphql';
+import { Expense } from '../../entities/Expense.entity';
+import { Invoice } from '../../entities/Invoice.entity';
 import { Offer } from '../../entities/Offer.entity';
 
 @InputType()
@@ -24,3 +26,75 @@ export class OfferInsert implements Partial<Offer> {
   @Field()
   validUntil: string;
 }
+
+@InputType()
+export class OfferUpdate implements Partial<Offer> {
+  @Field()
+  id: string;
+  @Field()
+  invoiceDate: string;
+  @Field({ nullable: true })
+  clientId?: string;
+  @Field()
+  clientData: string;
+  @Field()
+  profileData: string;
+  @Field()
+  profileId: string;
+  @Field()
+  items: string;
+  @Field()
+  amount: number;
+  @Field()
+  vat: number;
+  @Field()
+  vatRuleName: string;
+  @Field()
+  validUntil: string;
+}
+
+@InputType()
+export class InvoiceUpdate implements Partial<Invoice> {
+  @Field()
+  id: string;
+  @Field()
+  invoiceDate: string;
+  @Field({ nullable: true })
+  clientId: string;
+  @Field()
+  clientData: string;
+  @Field()
+  profileData: string;
+  @Field({ nullable: true })
+  profileId: string;
+  @Field()
+  items: string;
+  @Field()
+  amount: number;
+  @Field()
+  vat: number;
+  @Field()
+  vatRuleName: string;
+  @Field()
+  invoiceNumber: string;
+}
+
+@InputType()
+export class ExpenseUpdate implements Partial<Expense> {
+  @Field()
+  id: string;
+  @Field()
+  invoiceDate: string;
+  @Field({ nullable: true })
+  clientId: string;
+  @Field()
+  clientName: string;
+  @Field()
+  amount: number;
+  @Field()
+  vat: number;
+  @Field({ nullable: true })
+  description: string;
+  @Field()
+  invoiceNumber: string;
+}

src/renderer/components/Application.tsx

@@ -4,6 +4,7 @@ import { NoSsr } from '@material-ui/core';
 import CssBaseline from '@material-ui/core/CssBaseline';
 import { ThemeProvider as MaterialUIThemeProvider } from '@material-ui/core/styles';
 import { MuiPickersUtilsProvider } from '@material-ui/pickers';
+import en from 'date-fns/locale/en-GB';
 import * as React from 'react';
 import { hot } from 'react-hot-loader/root';
 import { HashRouter } from 'react-router-dom';
@@ -15,7 +16,6 @@ import { theme } from '../theme/theme';
 import { Notification } from './notification/Notification.component';
 import { Routes } from './Routes';
 import { Menu } from './toolbox/Menu.component';
-
 export const Application = () => {
   if (window.location.hash.endsWith('invoice')) {
     return (
@@ -40,7 +40,7 @@ export const Application = () => {
         <ApolloProvider client={client}>
           <ThemeProvider theme={theme}>
             <MaterialUIThemeProvider theme={theme}>
-              <MuiPickersUtilsProvider utils={DateFnsUtils}>
+              <MuiPickersUtilsProvider utils={DateFnsUtils} locale={en}>
                 <NotificationProvider>
                   <Notification />
                   <HashRouter>