Skip to content

Commit 4f48162

Browse files
MrBartusekMrBartusek
committed
Organize imports & fix lint issues
1 parent 0799c00 commit 4f48162

18 files changed

+35
-57
lines changed

‎apps/api/src/helpers/utils.ts

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { Logger } from '@nestjs/common';
22
import { SchemaOptions } from '@nestjs/mongoose';
3-
import { Request } from 'express';
43

54
const { BASE_API_URL, NODE_ENV } = process.env;
65
const logger = new Logger('Utils');

‎apps/api/src/main.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import { INestApplication, Logger, ValidationPipe } from '@nestjs/common';
1+
import { INestApplication, ValidationPipe } from '@nestjs/common';
22
import { NestFactory } from '@nestjs/core';
33
import { DocumentBuilder, SwaggerModule } from '@nestjs/swagger';
44
import RedisStore from 'connect-redis';
55
import * as session from 'express-session';
66
import * as passport from 'passport';
77
import { AppModule } from './app.module';
8-
import redisClient from './redis';
98
import Utils from './helpers/utils';
9+
import redisClient from './redis';
1010

1111
async function bootstrap() {
1212
const app = await NestFactory.create(AppModule);

‎apps/api/src/models/inventory/schemas/inventory-item.schema.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose';
22
import mongoose, { HydratedDocument } from 'mongoose';
33
import { BasicInventoryItemDto, InventoryItemDto } from 'shared-types';
4+
import DtoHelpers from '../../../helpers/dtoHelpers';
45
import { ProductDocument } from '../../products/schemas/product.schema';
56
import { Warehouse } from '../../warehouses/schemas/warehouse.schema';
6-
import DtoHelpers from '../../../helpers/dtoHelpers';
77

88
export type InventoryItemDocument = HydratedDocument<InventoryItem>;
99

‎apps/api/src/models/organizations/organizations-stats.service.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ describe('OrganizationsStatsService', () => {
99
let service: OrganizationsStatsService;
1010

1111
const mockOrgRepository = {
12-
findOneAndUpdate: jest.fn((id: Types.ObjectId) => {
12+
findOneAndUpdate: jest.fn(() => {
1313
return {
1414
stats: {
1515
totalProducts: 100,
@@ -18,7 +18,7 @@ describe('OrganizationsStatsService', () => {
1818
},
1919
};
2020
}),
21-
findById: jest.fn((id: Types.ObjectId) => {
21+
findById: jest.fn(() => {
2222
return {
2323
settings: {
2424
valueCalculationStrategy: OrgValueCalculationStrategy.BuyPrice,

‎apps/api/src/models/products/schemas/product.schema.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose';
22
import mongoose, { HydratedDocument } from 'mongoose';
33
import { BasicProductDto, ProductDto } from 'shared-types';
4-
import { Organization } from '../../organizations/schemas/organization.schema';
54
import DtoHelpers from '../../../helpers/dtoHelpers';
5+
import { Organization } from '../../organizations/schemas/organization.schema';
66

77
export type ProductDocument = HydratedDocument<Product>;
88

‎apps/api/src/models/warehouses/warehouses.controller.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ import { Test, TestingModule } from '@nestjs/testing';
33
import { Types } from 'mongoose';
44
import { CreateWarehouseDto, UpdateWarehouseDto } from 'shared-types';
55
import { InventoryService } from '../inventory/inventory.service';
6+
import { OrganizationsStatsService } from '../organizations/organizations-stats.service';
67
import { OrganizationsService } from '../organizations/organizations.service';
78
import { WarehousesController } from './warehouses.controller';
89
import { WarehousesService } from './warehouses.service';
9-
import { OrganizationsStatsService } from '../organizations/organizations-stats.service';
1010

1111
const MOCK_TAKEN_ORG_ID = new Types.ObjectId('62a23958e5a9e9b88f853a67');
1212
const MOCK_FREE_ORG_ID = new Types.ObjectId('657047c4e0cecd73abbad627');

‎apps/api/src/models/warehouses/warehouses.controller.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ import { Types } from 'mongoose';
1313
import { CreateWarehouseInOrgDto, UpdateWarehouseDto, WarehouseDto } from 'shared-types';
1414
import { ParseObjectIdPipe } from '../../pipes/prase-object-id.pipe';
1515
import { InventoryService } from '../inventory/inventory.service';
16+
import { OrganizationsStatsService } from '../organizations/organizations-stats.service';
1617
import { OrganizationsService } from '../organizations/organizations.service';
1718
import { Warehouse } from './schemas/warehouse.schema';
1819
import { WarehousesService } from './warehouses.service';
19-
import { OrganizationsStatsService } from '../organizations/organizations-stats.service';
2020

2121
@Controller('warehouses')
2222
export class WarehousesController {

‎apps/api/src/models/warehouses/warehouses.service.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ describe('WarehousesService', () => {
1111
create: jest.fn((dto: CreateWarehouseDto) => {
1212
return dto;
1313
}),
14-
exist: jest.fn((id: Types.ObjectId) => {
14+
exist: jest.fn(() => {
1515
return true;
1616
}),
1717
findById: jest.fn((id: Types.ObjectId) => {

‎packages/shared-types/src/ImageDto.ts

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import { IsBase64, IsEmpty, IsOptional, isBase64 } from "class-validator";
21

32
export class ImageDto {
43
hasImage: boolean;

‎packages/shared-types/src/index.ts

+20-37
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,30 @@
1-
import { BasicProductDto } from './product/BasicProductDto'
2-
import { BasicWarehouseDto } from './warehouse/BasicWarehouseDto'
3-
import { UserDto } from './user/UserDto'
41
import { SimpleResponseDto } from './SimpleResponseDto'
52
import { UserLoginDto } from './auth/UserLoginDto'
63
import { UserRegisterDto } from './auth/UserRegisterDto'
7-
import { CreateOrganizationDto } from './organizations/CreateOrganizationDto'
8-
import { CreateWarehouseDto } from './warehouse/CreateWarehouseDto'
9-
import { WarehouseDto } from './warehouse/WarehouseDto'
10-
import { OrganizationDto } from './organizations/OrganizationDto'
11-
import { PrivateUserDto } from './user/PrivateUserDto'
12-
import { CreateWarehouseInOrgDto } from './warehouse/CreateWarehouseInOrgDto'
13-
import { ProductDto } from './product/ProductDto'
14-
import { CreateProductDto } from './product/CreateProductDto'
154
import { BasicInventoryItemDto } from './inventory/BasicInventoryItemDto'
16-
import { InventoryItemDto } from './inventory/InventoryItemDto'
175
import { CreateInventoryItemDto } from './inventory/CreateInventoryItemDto'
6+
import { InventoryItemDto } from './inventory/InventoryItemDto'
7+
import { UpdateInventoryItemDto } from './inventory/UpdateInventoryItemDto'
8+
import { CreateOrganizationDto } from './organizations/CreateOrganizationDto'
9+
import { OrganizationDto } from './organizations/OrganizationDto'
1810
import { PatchOrganizationSettingsDto } from './organizations/PatchOrganizationSettingsDto'
11+
import { UpdateOrganizationDto } from './organizations/UpdateOrganizationDto'
12+
import { BasicProductDto } from './product/BasicProductDto'
13+
import { CreateProductDto } from './product/CreateProductDto'
14+
import { ProductDto } from './product/ProductDto'
1915
import { UpdateProductDto } from './product/UpdateProductDto'
16+
import { PrivateUserDto } from './user/PrivateUserDto'
17+
import { UserDto } from './user/UserDto'
18+
import { BasicWarehouseDto } from './warehouse/BasicWarehouseDto'
19+
import { CreateWarehouseDto } from './warehouse/CreateWarehouseDto'
20+
import { CreateWarehouseInOrgDto } from './warehouse/CreateWarehouseInOrgDto'
2021
import { UpdateWarehouseDto } from './warehouse/UpdateWarehouseDto'
21-
import { UpdateInventoryItemDto } from './inventory/UpdateInventoryItemDto'
22-
import { UpdateOrganizationDto } from './organizations/UpdateOrganizationDto'
22+
import { WarehouseDto } from './warehouse/WarehouseDto'
2323

2424
export {
25-
BasicProductDto,
26-
BasicWarehouseDto,
27-
UserDto,
28-
SimpleResponseDto,
29-
UserLoginDto,
30-
UserRegisterDto,
31-
CreateOrganizationDto,
32-
CreateWarehouseDto,
33-
OrganizationDto,
34-
WarehouseDto,
35-
PrivateUserDto,
36-
CreateWarehouseInOrgDto,
37-
ProductDto,
38-
CreateProductDto,
39-
BasicInventoryItemDto,
40-
InventoryItemDto,
41-
CreateInventoryItemDto,
42-
PatchOrganizationSettingsDto,
43-
UpdateProductDto,
44-
UpdateWarehouseDto,
45-
UpdateInventoryItemDto,
46-
UpdateOrganizationDto
47-
}
25+
BasicInventoryItemDto, BasicProductDto,
26+
BasicWarehouseDto, CreateInventoryItemDto, CreateOrganizationDto, CreateProductDto, CreateWarehouseDto, CreateWarehouseInOrgDto, InventoryItemDto, OrganizationDto, PatchOrganizationSettingsDto, PrivateUserDto, ProductDto, SimpleResponseDto, UpdateInventoryItemDto,
27+
UpdateOrganizationDto, UpdateProductDto,
28+
UpdateWarehouseDto, UserDto, UserLoginDto,
29+
UserRegisterDto, WarehouseDto
30+
}

‎packages/shared-types/src/inventory/InventoryItemDto.ts

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import { BaseDto } from "../BaseDto";
21
import { ProductDto } from "../product/ProductDto";
32

43
export class InventoryItemDto extends ProductDto {

‎packages/shared-types/src/inventory/UpdateInventoryItemDto.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { IsNumber, IsOptional, IsString, Length, isString } from "class-validator";
1+
import { IsNumber, IsOptional, IsString, Length } from "class-validator";
22

33
export class UpdateInventoryItemDto {
44
@IsNumber()

‎packages/shared-types/src/organizations/OrganizationDto.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { BasicWarehouseDto } from "../warehouse/BasicWarehouseDto";
21
import { BaseDto } from "../BaseDto";
2+
import { BasicWarehouseDto } from "../warehouse/BasicWarehouseDto";
33

44
export class OrganizationDto extends BaseDto {
55
name: string;

‎packages/shared-types/src/product/UpdateProductDto.ts

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import { MaxLength } from "class-validator";
21
import { CreateProductDto } from "./CreateProductDto";
32

43
export class UpdateProductDto extends CreateProductDto {

‎packages/shared-types/src/warehouse/CreateWarehouseDto.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { IsBoolean, Length } from "class-validator"
1+
import { Length } from "class-validator"
22

33
export class CreateWarehouseDto {
44
@Length(2, 32)

‎packages/shared-types/src/warehouse/CreateWarehouseInOrgDto.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { IsMongoId, MaxLength, ValidateNested } from "class-validator";
2-
import { CreateWarehouseDto } from "./CreateWarehouseDto"
31
import { Type } from "class-transformer";
2+
import { IsMongoId, ValidateNested } from "class-validator";
3+
import { CreateWarehouseDto } from "./CreateWarehouseDto";
44

55
export class CreateWarehouseInOrgDto {
66
@IsMongoId()

‎packages/shared-types/src/warehouse/UpdateWarehouseDto.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
import { CreateWarehouseDto } from "./CreateWarehouseDto"
1+
import { CreateWarehouseDto } from "./CreateWarehouseDto";
22

33
export class UpdateWarehouseDto extends CreateWarehouseDto { }

‎packages/shared-types/src/warehouse/WarehouseDto.ts

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import { BaseDto } from "../BaseDto";
21
import { BasicWarehouseDto } from "./BasicWarehouseDto";
32

43
export class WarehouseDto extends BasicWarehouseDto {

0 commit comments

Comments
 (0)