@dascompany/product 3.0.1 → 3.0.3

package/dist/SQL.json

@@ -11,8 +11,8 @@
     "accounts": {
         "select": "SELECT * FROM clients.accounts",
         "selectId": "SELECT id FROM clients.accounts ",
-        "insert": "INSERT INTO clients.accounts( id, email, activated, contact_details_id) VALUES ($id::BIGINT, LOWER($email::TEXT), $activated::BOOL, $contact_details_id::BIGINT)",
-        "update": "UPDATE clients.accounts SET activated = $activated::BOOL, deleted = $deleted::BOOL, contact_details_id = $contact_details_id::BIGINT, delivery_details_id = $delivery_details_id::BIGINT, invoice_details_id = $invoice_details_id::BIGINT WHERE id = $id::BIGINT",
+        "insert": "INSERT INTO clients.accounts( id, email, activated, personal_data_id) VALUES ($id::BIGINT, LOWER($email::TEXT), $activated::BOOL, $personal_data_id::BIGINT)",
+        "update": "UPDATE clients.accounts SET activated = $activated::BOOL, deleted = $deleted::BOOL, personal_data_id = $personal_details_id::BIGINT, delivery_details_id = $delivery_details_id::BIGINT, company_details_id = $company_details_id::BIGINT WHERE id = $id::BIGINT",
         "delete": "DELETE FROM clients.accounts WHERE id = $account_id::BIGINT",
         "count": "SELECT COUNT(*) AS total_rows FROM clients.accounts",
         "selectNextId": "SELECT nextval('clients.accounts_id'::regclass)"
@@ -53,8 +53,8 @@
     },
     "personalData": {
         "select": "SELECT * FROM personal_information.personal_data",
-        "insert": "INSERT INTO personal_information.personal_data (id, first_name, last_name, email, phone_number, company_details_id) VALUES ($id::BIGINT, $first_name::TEXT, $last_name::TEXT, $email::TEXT, $phone_number::TEXT, $company_details_id::BIGINT)",
-        "update": "UPDATE personal_information.personal_data SET email = $email::TEXT, first_name = $first_name::TEXT, last_name= $last_name::TEXT, phone_number = $phone_number::TEXT, company_details_id = $company_details_id::BIGINT WHERE id = $id::BIGINT",
+        "insert": "INSERT INTO personal_information.personal_data (id, first_name, last_name, email, phone_number) VALUES ($id::BIGINT, $first_name::TEXT, $last_name::TEXT, $email::TEXT, $phone_number::TEXT)",
+        "update": "UPDATE personal_information.personal_data SET email = $email::TEXT, first_name = $first_name::TEXT, last_name= $last_name::TEXT, phone_number = $phone_number::TEXT WHERE id = $id::BIGINT",
         "selectNextId": "SELECT nextval('personal_information.personal_data_id'::regclass)"
     },
     "companyDetails": {

package/dist/reader/ClientAccountReader.js

@@ -31,9 +31,9 @@ export default class ClientAccountReader {
             createdAt: client.created_at,
             activated: client.activated,
             deleted: client.deleted,
-            personalDataId: client.contact_details_id,
+            personalDataId: client.personal_data_id,
             deliveryDetailsId: client.delivery_details_id,
-            companyDetailsId: client.invoice_details_id,
+            companyDetailsId: client.company_details_id,
         };
     }
 }

package/dist/reader/CompanyDetailsReader.js

@@ -1,12 +1,16 @@
 import DatabaseConnection from "../DatabaseConnection";
+import AddressesReader from "./AddressesReader";
+import createQueryOptionsForId from "../utils/createQueryOptionsForId";
 export default class CompanyDetailsReader {
     static async get(queryOptions) {
         const companyDetails = await DatabaseConnection.getInstance().companyDetails.select(queryOptions);
+        const address = await AddressesReader.get(createQueryOptionsForId(companyDetails.address_id));
         if (companyDetails)
             return {
                 id: companyDetails.id,
                 name: companyDetails.name,
-                taxNumber: companyDetails.tax_number
+                taxNumber: companyDetails.tax_number,
+                address
             };
         else
             throw Error(`no companyDetails found with queryOptions: ${queryOptions}`);

package/dist/reader/PersonalDataReader.js

@@ -1,15 +1,9 @@
 import DatabaseConnection from "../DatabaseConnection";
 import correctPhoneNumber from "../utils/correctPhoneNumber";
-import CompanyDetailsReader from "./CompanyDetailsReader";
-import createQueryOptionsForId from "../utils/createQueryOptionsForId";
 export default class PersonalDataReader {
     static async get(queryOptions) {
         const personalDataRow = await DatabaseConnection.getInstance().personalData.select(queryOptions);
         const personalData = this.correctPersonalData(personalDataRow);
-        if (personalDataRow.company_details_id) {
-            personalData.companyDetails = await CompanyDetailsReader.get(createQueryOptionsForId(personalDataRow.company_details_id));
-            personalData.isCompany = true;
-        }
         return personalData;
     }
     static correctPersonalData(personalDataRow) {
@@ -19,9 +13,7 @@ export default class PersonalDataReader {
             firstName: personalDataRow.first_name,
             lastName: personalDataRow.last_name,
             email: personalDataRow.email,
-            phoneNumber,
-            companyDetails: null,
-            isCompany: false
+            phoneNumber
         };
     }
 }

package/dist/repo/CompanyDetailsRepo.js

@@ -6,7 +6,7 @@ export default class CompanyDetailsRepo {
         return this.createCompanyDetailsFromRow(companyDetailsRow);
     }
     static createCompanyDetailsFromRow(companyDetailsRow) {
-        const companyDetails = new CompanyDetails(companyDetailsRow.name, companyDetailsRow.tax_number);
+        const companyDetails = new CompanyDetails(companyDetailsRow.name, companyDetailsRow.tax_number, companyDetailsRow.address_id);
         companyDetails.setId(companyDetailsRow.id);
         return companyDetails;
     }

package/dist/repo/PersonalDataRepo.js

@@ -8,7 +8,7 @@ export default class PersonalDataRepo {
     }
     static createPersonalDataFromRow(dataRow) {
         const phoneNumber = correctPhoneNumber(dataRow.phone_number);
-        const personalData = new PersonalData(dataRow.email, dataRow.first_name, dataRow.last_name, phoneNumber, dataRow.company_details_id);
+        const personalData = new PersonalData(dataRow.email, dataRow.first_name, dataRow.last_name, phoneNumber);
         personalData.setId(dataRow.id);
         return personalData;
     }

package/dist/stockObjects/CompanyDetails.d.ts

@@ -1,12 +1,13 @@
 import { StockObject, StockObjectMapper } from "@dascompany/database";
-import CompanyDetailsI from "../types/CompanyDetailsI";
 export default class CompanyDetails extends StockObject {
     private name;
     private taxNumber;
-    constructor(name: string, taxNumber: string);
-    getData(): CompanyDetailsI;
+    private addressId;
+    constructor(name: string, taxNumber: string, addressId: number);
     getName(): string;
     getTaxNumber(): string;
+    getAddressId(): number;
+    setAddressId(addressId: number): void;
     setName(name: string): void;
     setTaxNumber(taxNumber: string): void;
     protected getMapper(): StockObjectMapper;

package/dist/stockObjects/CompanyDetails.js

@@ -3,18 +3,12 @@ import CompanyDetailsMapper from "../mappers/CompanyDetailsMapper";
 export default class CompanyDetails extends StockObject {
     name;
     taxNumber;
-    constructor(name, taxNumber) {
+    addressId;
+    constructor(name, taxNumber, addressId) {
         super();
         this.name = name;
-        this.taxNumber = taxNumber;
-    }
-    getData() {
-        const id = this.getId();
-        return {
-            id,
-            name: this.name,
-            taxNumber: this.taxNumber
-        };
+        this.taxNumber = taxNumber,
+            this.addressId = addressId;
     }
     getName() {
         return this.name;
@@ -22,6 +16,12 @@ export default class CompanyDetails extends StockObject {
     getTaxNumber() {
         return this.taxNumber;
     }
+    getAddressId() {
+        return this.addressId;
+    }
+    setAddressId(addressId) {
+        this.addressId = addressId;
+    }
     setName(name) {
         this.name = name;
     }

package/dist/stockObjects/PersonalData.d.ts

@@ -1,34 +1,24 @@
 import { StockObject, StockObjectMapper } from "@dascompany/database";
-import CompanyDetails from "./CompanyDetails";
-import CompanyDetailsI from "../types/CompanyDetailsI";
 export default class PersonalData extends StockObject {
     private email;
     private firstName;
     private lastName;
     private phoneNumber;
-    private companyDetailsId;
-    private companyDetails;
-    constructor(email: string, firstName: string, lastName: string, phoneNumber: string, companyDetailsId?: number | null);
+    constructor(email: string, firstName: string, lastName: string, phoneNumber: string);
     getData(): Promise<{
         email: string;
         firstName: string;
         lastName: string;
         phoneNumber: string;
-        companyDetails: CompanyDetailsI | null;
     }>;
-    getCompanyDetailsData(): Promise<CompanyDetailsI | null>;
-    getCompanyDetails(): Promise<CompanyDetails | null>;
-    isCompany(): boolean;
     getEmail(): string;
     getFirstName(): string;
     getLastName(): string;
     getName(): string;
     getPhoneNumber(): string;
-    getCompanyDetailsId(): number | null;
     setEmail(email: string): void;
     setFirstName(firstName: string): void;
     setLastName(lastName: string): void;
     setPhoneNumber(phoneNumber: string): void;
-    setCompanyDetailsId(companyDetailsId: number | null): void;
     protected getMapper(): StockObjectMapper;
 }

package/dist/stockObjects/PersonalData.js

@@ -1,50 +1,25 @@
-import { ParameterType, QueryOptions, StockObject } from "@dascompany/database";
+import { StockObject } from "@dascompany/database";
 import PersonalDataMapper from "../mappers/PersonalDataMapper";
-import CompanyDetailsRepo from "../repo/CompanyDetailsRepo";
 export default class PersonalData extends StockObject {
     email;
     firstName;
     lastName;
     phoneNumber;
-    companyDetailsId;
-    companyDetails;
-    constructor(email, firstName, lastName, phoneNumber, companyDetailsId = null) {
+    constructor(email, firstName, lastName, phoneNumber) {
         super();
         this.email = email;
         this.firstName = firstName;
         this.lastName = lastName;
         this.phoneNumber = phoneNumber;
-        this.companyDetailsId = companyDetailsId;
-        this.companyDetails = null;
     }
     async getData() {
-        const companyDetails = await this.getCompanyDetailsData();
         return {
             email: this.email,
             firstName: this.firstName,
             lastName: this.lastName,
             phoneNumber: this.phoneNumber,
-            companyDetails,
         };
     }
-    async getCompanyDetailsData() {
-        let companyDetailsData = null;
-        await this.getCompanyDetails();
-        if (this.companyDetails)
-            companyDetailsData = this.companyDetails.getData();
-        return companyDetailsData;
-    }
-    async getCompanyDetails() {
-        if (this.companyDetailsId && !this.companyDetails) {
-            const queryOptions = new QueryOptions();
-            queryOptions.setWhere([{ name: 'id', type: ParameterType.bigint, value: this.companyDetailsId }]);
-            this.companyDetails = await CompanyDetailsRepo.get(queryOptions);
-        }
-        return this.companyDetails;
-    }
-    isCompany() {
-        return !!this.companyDetailsId;
-    }
     getEmail() {
         return this.email;
     }
@@ -60,9 +35,6 @@ export default class PersonalData extends StockObject {
     getPhoneNumber() {
         return this.phoneNumber;
     }
-    getCompanyDetailsId() {
-        return this.companyDetailsId;
-    }
     setEmail(email) {
         this.email = email;
     }
@@ -75,9 +47,6 @@ export default class PersonalData extends StockObject {
     setPhoneNumber(phoneNumber) {
         this.phoneNumber = phoneNumber;
     }
-    setCompanyDetailsId(companyDetailsId) {
-        this.companyDetailsId = companyDetailsId;
-    }
     getMapper() {
         return new PersonalDataMapper(this);
     }

package/dist/tables/personalInformation/CompanyDetailsTable.js

@@ -33,5 +33,6 @@ export default class CompanyDetailsTable extends Table {
     bindParameters(query, companyDetails) {
         query.bindParameter('name', companyDetails.getName());
         query.bindParameter('tax_number', companyDetails.getTaxNumber());
+        query.bindParameter('address_id', companyDetails.getAddressId());
     }
 }

package/dist/tables/personalInformation/PersonalDataTable.js

@@ -31,6 +31,5 @@ export default class PersonalDataTable extends Table {
         query.bindParameter('first_name', personalData.getFirstName());
         query.bindParameter('last_name', personalData.getLastName());
         query.bindParameter('phone_number', personalData.getPhoneNumber());
-        query.bindParameter('company_details_id', personalData.getCompanyDetailsId());
     }
 }

package/dist/types/CompanyDetailsI.d.ts

@@ -1,5 +1,7 @@
+import AddressI from "./AddressI";
 export default interface CompanyDetailsI {
     id: number | null;
     name: string;
     taxNumber: string;
+    address: AddressI;
 }

package/dist/types/PersonalDataI.d.ts

@@ -1,10 +1,7 @@
-import CompanyDetailsI from "./CompanyDetailsI";
 export default interface PersonalDataI {
     id: number;
     firstName: string;
     lastName: string;
     email: string;
     phoneNumber: string;
-    isCompany: boolean;
-    companyDetails: CompanyDetailsI | null;
 }

package/dist/types/rows/CompanyDetailsRow.d.ts

@@ -2,4 +2,5 @@ export default interface CompanyDetailsRow {
     id: number;
     name: string;
     tax_number: string;
+    address_id: number;
 }

package/dist/types/rows/PersonalDataRow.d.ts

@@ -4,5 +4,4 @@ export default interface PersonalDataRow {
     last_name: string;
     email: string;
     phone_number: string;
-    company_details_id: number;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dascompany/product",
-  "version": "3.0.1",
+  "version": "3.0.3",
   "main": "dist/index.js",
   "scripts": {
     "test": "vitest",

package/dist/mappers/AccountAddressMapper.d.ts

@@ -1,9 +0,0 @@
-import { StockObjectMapper } from "@dascompany/database";
-import AccountAddress from "../stockObjects/AccountAddress";
-export default class AccountAddressMapper implements StockObjectMapper {
-    private accountAddress;
-    private accountAddressessTable;
-    constructor(accountAddress: AccountAddress);
-    save(): Promise<void>;
-    delete(): Promise<void>;
-}

package/dist/mappers/AccountAddressMapper.js

@@ -1,19 +0,0 @@
-import DatabaseConnection from "../DatabaseConnection";
-export default class AccountAddressMapper {
-    accountAddress;
-    accountAddressessTable;
-    constructor(accountAddress) {
-        this.accountAddressessTable = DatabaseConnection.getInstance().accountAddresses;
-        this.accountAddress = accountAddress;
-    }
-    async save() {
-        await this.accountAddressessTable.insert(this.accountAddress);
-    }
-    async delete() {
-        const accountAddressId = this.accountAddress.getId();
-        if (accountAddressId)
-            await this.accountAddressessTable.delete(accountAddressId);
-        else
-            throw new Error('Can`t remove the order and product connection without providing its ID');
-    }
-}

package/dist/reader/AccountAddressesReader.d.ts

@@ -1,7 +0,0 @@
-import { QueryOptions } from "@dascompany/database";
-import AccountAddressesI from "../types/AccountAddressesI";
-export default class AccountAddressesReader {
-    static getAll(queryOptions?: QueryOptions): Promise<AccountAddressesI[]>;
-    private static correctAccountAddresses;
-    private static correctAccountAddress;
-}

package/dist/reader/AccountAddressesReader.js

@@ -1,26 +0,0 @@
-import DatabaseConnection from "../DatabaseConnection";
-import AddressesReader from "./AddressesReader";
-import createQueryOptionsForId from "../utils/createQueryOptionsForId";
-export default class AccountAddressesReader {
-    static async getAll(queryOptions) {
-        const accountAddresses = await DatabaseConnection.getInstance().accountAddresses.selectAll(queryOptions);
-        return this.correctAccountAddresses(accountAddresses);
-    }
-    static async correctAccountAddresses(accountAddresses) {
-        const correctAccountAddresses = [];
-        for (let i = 0; i < accountAddresses.length; i++) {
-            const correctAccountAddress = await this.correctAccountAddress(accountAddresses[i]);
-            correctAccountAddresses.push(correctAccountAddress);
-        }
-        return correctAccountAddresses;
-    }
-    static async correctAccountAddress(accountAddress) {
-        const address = await AddressesReader.get(createQueryOptionsForId(accountAddress.address_id));
-        const correctAddress = {
-            id: accountAddress.id,
-            accountId: accountAddress.account_id,
-            address: address
-        };
-        return correctAddress;
-    }
-}

package/dist/repo/AccountAddressesRepo.d.ts

@@ -1,6 +0,0 @@
-import { QueryOptions } from "@dascompany/database";
-import AccountAddress from "../stockObjects/AccountAddress";
-export default class AccountAddressesRepo {
-    static get(queryOptions: QueryOptions): Promise<AccountAddress>;
-    private static createAccountAddressFromRow;
-}

package/dist/repo/AccountAddressesRepo.js

@@ -1,13 +0,0 @@
-import DatabaseConnection from "../DatabaseConnection";
-import AccountAddress from "../stockObjects/AccountAddress";
-export default class AccountAddressesRepo {
-    static async get(queryOptions) {
-        const accountAddress = await DatabaseConnection.getInstance().accountAddresses.select(queryOptions);
-        return this.createAccountAddressFromRow(accountAddress);
-    }
-    static async createAccountAddressFromRow(dataRow) {
-        const accountAddress = new AccountAddress(dataRow.account_id, dataRow.address_id);
-        accountAddress.setId(dataRow.id);
-        return accountAddress;
-    }
-}

package/dist/repo/OrderStatusRepo.d.ts

@@ -1,8 +0,0 @@
-import { QueryOptions } from "@dascompany/database";
-import Status from "../stockObjects/Status";
-export default class OrderStatusRepo {
-    static get(queryOptions: QueryOptions): Promise<Status>;
-    static getAll(queryOptions?: QueryOptions): Promise<Status[]>;
-    private static createStatusesFromRows;
-    private static createStatusFromRow;
-}

package/dist/repo/OrderStatusRepo.js

@@ -1,25 +0,0 @@
-import DatabaseConnection from "../DatabaseConnection";
-import Status from "../stockObjects/Status";
-export default class OrderStatusRepo {
-    static async get(queryOptions) {
-        const status = await DatabaseConnection.getInstance().statuses.select(queryOptions);
-        return this.createStatusFromRow(status);
-    }
-    static async getAll(queryOptions) {
-        const statuses = await DatabaseConnection.getInstance().statuses.selectAll(queryOptions);
-        return this.createStatusesFromRows(statuses);
-    }
-    static async createStatusesFromRows(dataRows) {
-        const statuses = [];
-        for (const dataRow of dataRows) {
-            const status = await this.createStatusFromRow(dataRow);
-            statuses.push(status);
-        }
-        return statuses;
-    }
-    static async createStatusFromRow(dataRow) {
-        const status = new Status(dataRow.order_id, dataRow.user_id, dataRow.type, dataRow.created_at);
-        status.setId(dataRow.id);
-        return status;
-    }
-}

package/dist/stockObjects/AccountAddress.d.ts

@@ -1,11 +0,0 @@
-import { StockObject, StockObjectMapper } from "@dascompany/database";
-export default class AccountAddress extends StockObject {
-    private accountId;
-    private addressId;
-    constructor(accountId: number, addressId: number);
-    getAccountId(): number;
-    getAddressId(): number;
-    setAccountId(accountId: number): void;
-    setAddressId(addressId: number): void;
-    protected getMapper(): StockObjectMapper;
-}

package/dist/stockObjects/AccountAddress.js

@@ -1,26 +0,0 @@
-import { StockObject } from "@dascompany/database";
-import AccountAddressMapper from "../mappers/AccountAddressMapper";
-export default class AccountAddress extends StockObject {
-    accountId;
-    addressId;
-    constructor(accountId, addressId) {
-        super();
-        this.accountId = accountId;
-        this.addressId = addressId;
-    }
-    getAccountId() {
-        return this.accountId;
-    }
-    getAddressId() {
-        return this.addressId;
-    }
-    setAccountId(accountId) {
-        this.accountId = accountId;
-    }
-    setAddressId(addressId) {
-        this.addressId = addressId;
-    }
-    getMapper() {
-        return new AccountAddressMapper(this);
-    }
-}

package/dist/tables/clients/AccountAddressesTable.d.ts

@@ -1,12 +0,0 @@
-import { QueryOptions, Table } from '@dascompany/database';
-import AccountAddressesRow from '../../types/rows/AccountAddressesRow';
-import AccountAddress from '../../stockObjects/AccountAddress';
-export default class AccountAddressesTable extends Table {
-    select(queryOptions: QueryOptions): Promise<AccountAddressesRow>;
-    selectAll(queryOptions?: QueryOptions): Promise<AccountAddressesRow[]>;
-    selectId(queryOptions: QueryOptions): Promise<number | null>;
-    delete(id: number): Promise<number>;
-    private bindParameters;
-    insert(AccountAddresses: AccountAddress): Promise<void>;
-    private selectNextId;
-}

package/dist/tables/clients/AccountAddressesTable.js

@@ -1,41 +0,0 @@
-import { Table } from '@dascompany/database';
-import * as SQL from '../../SQL.json';
-export default class AccountAddressesTable extends Table {
-    async select(queryOptions) {
-        const query = this.createQuery(SQL.accountAddresses.select, queryOptions);
-        const result = await query.execute();
-        return result.getRow();
-    }
-    async selectAll(queryOptions) {
-        const query = this.createQuery(SQL.accountAddresses.select, queryOptions);
-        const result = await query.execute();
-        return result.getRows();
-    }
-    async selectId(queryOptions) {
-        const query = this.createQuery(SQL.accountAddresses.selectId, queryOptions);
-        const result = await query.execute();
-        return result.getValue();
-    }
-    async delete(id) {
-        const query = this.createQuery(SQL.accountAddresses.delete);
-        query.bindParameter('id', id);
-        const result = await query.execute();
-        return result.getRowCount();
-    }
-    bindParameters(query, AccountAddresses) {
-        query.bindParameter('account_id', AccountAddresses.getAccountId());
-        query.bindParameter('address_id', AccountAddresses.getAddressId());
-    }
-    async insert(AccountAddresses) {
-        const id = await this.selectNextId();
-        const query = this.createQuery(SQL.accountAddresses.insert);
-        this.bindParameters(query, AccountAddresses);
-        await query.execute();
-        AccountAddresses.setId(id);
-    }
-    async selectNextId() {
-        const query = this.createQuery(SQL.accountAddresses.selectNextId);
-        const result = await query.execute();
-        return result.getValue();
-    }
-}

package/dist/types/AccountAddressesI.d.ts

@@ -1,6 +0,0 @@
-import AddressI from "./AddressI";
-export default interface AccountAddressesI {
-    id: number;
-    accountId: number;
-    address: AddressI;
-}

package/dist/types/AccountAddressesI.js

@@ -1 +0,0 @@
-export {};

package/dist/types/rows/AccountAddressesRow.d.ts

@@ -1,5 +0,0 @@
-export default interface AccountAddressesRow {
-    id: number;
-    account_id: number;
-    address_id: number;
-}

package/dist/types/rows/AccountAddressesRow.js

@@ -1 +0,0 @@
-export {};

package/dist/utils/calculateNetToGrossPrice.d.ts

@@ -1 +0,0 @@
-export default function calculateNetToGrossPrice(netPrice: number, vatPercentage: number): number;

package/dist/utils/calculateNetToGrossPrice.js

@@ -1,7 +0,0 @@
-export default function calculateNetToGrossPrice(netPrice, vatPercentage) {
-    const netPriceInPenny = Math.round(netPrice * 100);
-    const vatPriceInPenny = Math.round((netPriceInPenny * vatPercentage) / 100);
-    const grossPriceInPenny = netPriceInPenny + vatPriceInPenny;
-    const grossPrice = (grossPriceInPenny / 100).toFixed(2);
-    return Number(grossPrice);
-}