Skip to content

Commit

Permalink
feat(daily): add order to the daily
Browse files Browse the repository at this point in the history
  • Loading branch information
alpemreelmas committed May 9, 2024
1 parent fc07e69 commit 9aed642
Show file tree
Hide file tree
Showing 7 changed files with 81 additions and 4 deletions.
17 changes: 17 additions & 0 deletions .github/workflows/deploy-main.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Basic deploy
on:
push:
branches: [ master ]

jobs:
EC2-Deploy:
runs-on: ubuntu-latest
steps:
- id: deploy
uses: bitovi/github-actions-deploy-docker-to-ec2@v1.0.1
with:
aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws_default_region: us-east-1

aws_elb_app_port: 3000 # This should match the docker exposed port. Defaults to 3000.
47 changes: 47 additions & 0 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
version: '3'

services:
backend:
build: ./
container_name: nestjs-backend
env_file:
- .env
ports:
- '3000:3000'
depends_on:
- database
- redis_queue
networks:
- nestjs_network
database:
image: mongo
container_name: mongo_db
ports:
- '27017:27017'
volumes:
- './mongodb-backup:/data/db'
networks:
- nestjs_network
redis_queue:
image: redis:alpine
container_name: redis_queue
volumes:
- "/data"
ports:
- '6379:6379'
networks:
- nestjs_network

redis_insight:
image: redis/redisinsight:latest
container_name: redis_insight
volumes:
- "./redisinsight:/data"
ports:
- '5540:5540'
networks:
- nestjs_network

networks:
nestjs_network:
driver: bridge
1 change: 0 additions & 1 deletion src/auth/services/auth.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,6 @@ export class AuthService {
if (!token) {
throw new UnauthorizedException();
}
console.log(moment().diff(moment(token.validUntil)));
if (moment(token.validUntil).diff(moment()) < 0 || !token.isValid) {
throw new UnauthorizedException();
}
Expand Down
5 changes: 4 additions & 1 deletion src/daily/daily.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ export class DailyService {
@InjectModel(Daily.name) private DailyModel: Model<DailyDocument>,
) {}
async create(createDailyDto: CreateDailyDto, user: any) {
return await this.DailyModel.create({ ...createDailyDto, user: user.sub });
return await this.DailyModel.create({
...createDailyDto,
user: user.sub,
});
}

async findAll(user: any) {
Expand Down
6 changes: 5 additions & 1 deletion src/daily/dto/create-daily.dto.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
import { IsNotEmpty, IsString } from 'class-validator';
import { IsNotEmpty, IsNumber, IsString } from 'class-validator';

export class CreateDailyDto {
@IsString()
@IsNotEmpty()
public content: string;

@IsNumber()
@IsNotEmpty()
public orderId: number;
}
7 changes: 6 additions & 1 deletion src/daily/dto/update-daily.dto.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
import { PartialType } from '@nestjs/swagger';
import { CreateDailyDto } from './create-daily.dto';
import { IsNumber, IsOptional } from 'class-validator';

export class UpdateDailyDto extends PartialType(CreateDailyDto) {}
export class UpdateDailyDto extends PartialType(CreateDailyDto) {
@IsNumber()
@IsOptional()
public orderId: number;
}
2 changes: 2 additions & 0 deletions src/daily/entities/daily.entity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ export class Daily {
user: User;
@Prop({ required: true })
content: string;
@Prop({ required: true })
orderId: number;
@Prop({ required: true, default: Date.now() })
createdAt: Date;
@Prop({ required: true, default: Date.now() })
Expand Down

0 comments on commit 9aed642

Please sign in to comment.