Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release #420

Merged
merged 163 commits into from
Nov 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
163 commits
Select commit Hold shift + click to select a range
213bebe
Development (#235)
olasunkanmi-SE Mar 22, 2023
408206b
Development (#237)
olasunkanmi-SE Mar 22, 2023
a59597d
Merge branch 'main' into release
olasunkanmi-SE Mar 22, 2023
1da8dae
Development (#239)
olasunkanmi-SE Mar 24, 2023
ff34c79
Merge branch 'main' into release
olasunkanmi-SE Mar 24, 2023
161b407
Development (#241)
olasunkanmi-SE Mar 24, 2023
0d3e4ab
Development (#242)
olasunkanmi-SE Mar 24, 2023
e09bbee
Development (#244)
olasunkanmi-SE Mar 25, 2023
80d79ad
Merge branch 'main' into release
olasunkanmi-SE Mar 25, 2023
0cffaf0
Development (#246)
olasunkanmi-SE Mar 26, 2023
6b81e70
Development (#248)
olasunkanmi-SE Mar 28, 2023
4ce925f
Merge branch 'main' into release
olasunkanmi-SE Mar 28, 2023
105a48c
Development (#250)
olasunkanmi-SE Mar 29, 2023
acacbc5
Merge branch 'main' into release
olasunkanmi-SE Mar 29, 2023
1d5973f
Development (#252)
olasunkanmi-SE Mar 30, 2023
d2f84cd
Development (#254)
olasunkanmi-SE Apr 3, 2023
58b3f73
Merge branch 'main' into release
olasunkanmi-SE Apr 3, 2023
67e491b
Development (#256)
olasunkanmi-SE Apr 4, 2023
e15a1ac
Development (#257)
olasunkanmi-SE Apr 5, 2023
b3a4f96
Merge branch 'main' into release
olasunkanmi-SE Apr 5, 2023
0c497a9
Development (#259)
olasunkanmi-SE Apr 5, 2023
817f37f
Merge branch 'main' of github.com:olasunkanmi-SE/restaurant into release
olasunkanmi-SE Apr 5, 2023
f926fc1
Development (#261)
olasunkanmi-SE Apr 7, 2023
94c9bed
Development (#262)
olasunkanmi-SE Apr 7, 2023
07f96d8
Merge branch 'main' into release
olasunkanmi-SE Apr 7, 2023
4f24b0f
Development (#264)
olasunkanmi-SE Apr 8, 2023
ef9db9a
Development (#266)
olasunkanmi-SE Apr 10, 2023
09bda0c
Merge branch 'main' of github.com:olasunkanmi-SE/restaurant into release
olasunkanmi-SE Apr 10, 2023
ffd0ef0
merge conflicts
olasunkanmi-SE Apr 10, 2023
82185f8
Development (#267)
olasunkanmi-SE Apr 17, 2023
ff3d32d
Merge branch 'main' into release
olasunkanmi-SE Apr 17, 2023
5960225
Development (#269)
olasunkanmi-SE Apr 18, 2023
752679f
Merge branch 'main' into release
olasunkanmi-SE Apr 18, 2023
e456a8c
Development (#271)
olasunkanmi-SE Apr 18, 2023
2d32e0a
Merge branch 'main' into release
olasunkanmi-SE Apr 18, 2023
49a8928
Development (#273)
olasunkanmi-SE Apr 20, 2023
ab47b0e
Development (#274)
olasunkanmi-SE Apr 20, 2023
8640136
Merge branch 'main' into release
olasunkanmi-SE Apr 20, 2023
72f5d5d
Development (#276)
olasunkanmi-SE Apr 20, 2023
297d996
Development (#277)
olasunkanmi-SE Apr 20, 2023
2e50dbe
Merge branch 'main' into release
olasunkanmi-SE Apr 20, 2023
3635920
Development (#279)
olasunkanmi-SE Apr 20, 2023
02df24f
Development (#287)
olasunkanmi-SE Jun 4, 2023
aa202a1
Merge branch 'main' into release
olasunkanmi-SE Jun 4, 2023
fe03ba9
Development (#290)
olasunkanmi-SE Jun 4, 2023
ca144cc
Merge branch 'main' into release
olasunkanmi-SE Jun 4, 2023
7332c02
Development (#292)
olasunkanmi-SE Jun 4, 2023
43264a0
Merge branch 'main' into release
olasunkanmi-SE Jun 4, 2023
1d3ef56
Development (#295)
olasunkanmi-SE Jun 5, 2023
7e411fe
Merge branch 'main' into release
olasunkanmi-SE Jun 5, 2023
115d353
Development (#297)
olasunkanmi-SE Jun 7, 2023
7f7cb7a
Development (#298)
olasunkanmi-SE Jun 8, 2023
9019a8f
Merge branch 'main' into release
olasunkanmi-SE Jun 8, 2023
5bc47ce
Development (#300)
olasunkanmi-SE Jun 8, 2023
af1646c
Development (#301)
olasunkanmi-SE Jun 10, 2023
441d88e
Merge branch 'main' into release
olasunkanmi-SE Jun 10, 2023
1834c0b
Development (#303)
olasunkanmi-SE Jun 12, 2023
d7da6ea
Development (#306)
olasunkanmi-SE Jun 17, 2023
774e898
Merge branch 'main' into release
olasunkanmi-SE Jun 17, 2023
8a1f1d7
Development (#308)
olasunkanmi-SE Jun 17, 2023
f7fc265
Merge branch 'main' into release
olasunkanmi-SE Jun 17, 2023
66672d9
Development (#310)
olasunkanmi-SE Jun 19, 2023
c0a6bba
Merge branch 'main' into release
olasunkanmi-SE Jun 19, 2023
9691d3c
Development (#312)
olasunkanmi-SE Jun 19, 2023
0f2aeef
Merge branch 'main' into release
olasunkanmi-SE Jun 19, 2023
776d278
Development (#315)
olasunkanmi-SE Jun 20, 2023
d44f0af
fix conflicts
olasunkanmi-SE Jun 20, 2023
c35c58f
Development (#317)
olasunkanmi-SE Jun 20, 2023
dd190eb
Merge branch 'main' into release
olasunkanmi-SE Jun 20, 2023
99312c6
Development (#319)
olasunkanmi-SE Jun 20, 2023
0afc3f6
Merge branch 'main' into release
olasunkanmi-SE Jun 20, 2023
93cad99
Development (#322)
olasunkanmi-SE Jun 21, 2023
c2cd10b
Development (#323)
olasunkanmi-SE Jun 21, 2023
fd81d32
Development (#327)
olasunkanmi-SE Jun 22, 2023
ebaf65b
Development (#329)
olasunkanmi-SE Jun 27, 2023
832ff5c
create the order domain class
olasunkanmi-SE Jun 30, 2023
c84a4ce
create the order domain class
olasunkanmi-SE Jun 30, 2023
705c74e
create the order schema
olasunkanmi-SE Jun 30, 2023
249af25
create the selected item schema
olasunkanmi-SE Jun 30, 2023
8de8e9d
create the selected item schema (#333)
olasunkanmi-SE Jun 30, 2023
c9e4582
Merge branch 'main' into release
olasunkanmi-SE Jun 30, 2023
58e35ee
create cart item domain and schema
olasunkanmi-SE Jun 30, 2023
704656c
Merge branch 'release' into development
olasunkanmi-SE Jun 30, 2023
5c12a4d
Development (#335)
olasunkanmi-SE Jun 30, 2023
af5f107
Merge branch 'main' into release
olasunkanmi-SE Jun 30, 2023
c1caf06
create the order repository method
olasunkanmi-SE Jun 30, 2023
502ed5c
Merge branch 'development' of github.com:olasunkanmi-SE/restaurant in…
olasunkanmi-SE Jun 30, 2023
d61a046
add the order repository interface
olasunkanmi-SE Jun 30, 2023
bc623d7
Development (#337)
olasunkanmi-SE Jun 30, 2023
2bfebbe
create the cart items and selected cart items mapper
olasunkanmi-SE Jun 30, 2023
ec2a3bc
Merge branch 'release' into development
olasunkanmi-SE Jul 1, 2023
c954219
Development (#338)
olasunkanmi-SE Jul 1, 2023
35b410b
Merge branch 'main' into release
olasunkanmi-SE Jul 1, 2023
0c8e646
add note for selected items
olasunkanmi-SE Jul 4, 2023
d2c47d5
Merge branch 'development' of github.com:olasunkanmi-SE/restaurant in…
olasunkanmi-SE Jul 4, 2023
9c1ca4f
fix code smells
olasunkanmi-SE Jul 4, 2023
92c87f6
Development (#340)
olasunkanmi-SE Jul 4, 2023
9a17aca
implement add item notes
olasunkanmi-SE Jul 4, 2023
6184ecc
Development (#342)
olasunkanmi-SE Jul 4, 2023
1f1da9f
update sonar cloud project properties to include test coverage from jest
olasunkanmi-SE Jul 8, 2023
88b63d5
Development (#345)
olasunkanmi-SE Jul 10, 2023
3abdf6a
remove unused codes and fix the close cart on add to cart upgraded me…
olasunkanmi-SE Jul 23, 2023
febc9f8
Merge branch 'release' into development
olasunkanmi-SE Jul 23, 2023
db8913e
Development (#350)
olasunkanmi-SE Jul 23, 2023
f832b34
Merge branch 'main' into release
olasunkanmi-SE Jul 23, 2023
4b2ae83
display the name of menu without selected items
olasunkanmi-SE Jul 23, 2023
20e7417
Merge branch 'development' of github.com:olasunkanmi-SE/restaurant in…
olasunkanmi-SE Jul 23, 2023
ece98c3
Development (#352)
olasunkanmi-SE Jul 23, 2023
4ba885b
do not display the selected item quantity if it is zero
olasunkanmi-SE Jul 23, 2023
3d79c2c
Development (#355)
olasunkanmi-SE Jul 23, 2023
c66ee6f
add instructions to each addons
olasunkanmi-SE Jul 24, 2023
4c2ca45
Development (#357)
olasunkanmi-SE Jul 24, 2023
5374286
add instructions to menu order
olasunkanmi-SE Jul 25, 2023
19a5b8d
Merge branch 'release' into development
olasunkanmi-SE Jul 25, 2023
7d59363
Development (#358)
olasunkanmi-SE Jul 25, 2023
21a8d7f
close the instruction modal on set instruction for menu
olasunkanmi-SE Jul 25, 2023
7375e52
Merge branch 'development' of github.com:olasunkanmi-SE/restaurant in…
olasunkanmi-SE Jul 25, 2023
9658820
Merge branch 'release' into development
olasunkanmi-SE Jul 25, 2023
c8ca075
Development (#360)
olasunkanmi-SE Jul 25, 2023
a30717b
Merge branch 'main' into release
olasunkanmi-SE Jul 25, 2023
7b5ae25
Olasunkanmi se patch 4 (#362)
olasunkanmi-SE Jul 25, 2023
d88d09e
Development (#366)
olasunkanmi-SE Jul 25, 2023
bd7468e
on navigating away reset the menu state
olasunkanmi-SE Jul 25, 2023
7320453
Merge branch 'development' of github.com:olasunkanmi-SE/restaurant in…
olasunkanmi-SE Jul 25, 2023
e7af84d
Merge branch 'release' into development
olasunkanmi-SE Jul 25, 2023
b6a5a62
Development (#368)
olasunkanmi-SE Jul 25, 2023
64d5b03
Merge branch 'main' into release
olasunkanmi-SE Jul 25, 2023
dd0b21e
Development (#371)
olasunkanmi-SE Jul 25, 2023
882c64f
update menu notes on both update cart items and menu page
olasunkanmi-SE Jul 26, 2023
90e934b
Merge branch 'development' of github.com:olasunkanmi-SE/restaurant in…
olasunkanmi-SE Jul 26, 2023
690ff30
Merge branch 'release' into development
olasunkanmi-SE Jul 26, 2023
2fec080
Development (#372)
olasunkanmi-SE Jul 26, 2023
de092f5
Merge branch 'main' into release
olasunkanmi-SE Jul 26, 2023
7bbf834
rename textbox to menu note
olasunkanmi-SE Jul 26, 2023
5e4ea93
Merge branch 'development' of github.com:olasunkanmi-SE/restaurant in…
olasunkanmi-SE Jul 26, 2023
09365cc
display Note instructions on upgrade set meal page
olasunkanmi-SE Jul 26, 2023
13abbf6
update the upgrade meal page
olasunkanmi-SE Jul 26, 2023
e0d587c
merge release to dev
olasunkanmi-SE Jul 26, 2023
4da1f58
create a new release branch
olasunkanmi-SE Jul 26, 2023
3f833ca
Development (#377)
olasunkanmi-SE Jul 26, 2023
8606338
Development (#381)
olasunkanmi-SE Sep 11, 2023
a2395ac
Development (#383)
olasunkanmi-SE Sep 11, 2023
923c061
Development (#385)
olasunkanmi-SE Sep 23, 2023
e22fc92
Merge branch 'main' into release
olasunkanmi-SE Sep 23, 2023
376956d
Development (#387)
olasunkanmi-SE Sep 24, 2023
5be1387
Development (#389)
olasunkanmi-SE Sep 24, 2023
03c3e22
Merge branch 'main' into release
olasunkanmi-SE Sep 24, 2023
e297ace
Development (#397)
olasunkanmi-SE Oct 24, 2023
ce70f25
Merge branch 'main' into release
olasunkanmi-SE Oct 24, 2023
2f39211
Development (#404)
olasunkanmi-SE Oct 29, 2023
7e9bfb4
Merge branch 'main' into release
olasunkanmi-SE Oct 29, 2023
1f346d7
Development (#406)
olasunkanmi-SE Oct 29, 2023
2c0b455
Merge branch 'main' into release
olasunkanmi-SE Oct 29, 2023
9a05416
Development (#408)
olasunkanmi-SE Oct 29, 2023
1022094
Development (#411)
olasunkanmi-SE Nov 12, 2023
543c3ec
Merge branch 'main' into release
olasunkanmi-SE Nov 12, 2023
bfae634
Development (#413)
olasunkanmi-SE Nov 12, 2023
538e07f
Development (#415)
olasunkanmi-SE Nov 13, 2023
983b72f
Merge branch 'main' into release
olasunkanmi-SE Nov 14, 2023
57a901d
Development (#417)
olasunkanmi-SE Nov 14, 2023
d0d1403
Merge branch 'main' of github.com:olasunkanmi-SE/restaurant into release
olasunkanmi-SE Nov 14, 2023
cf7286b
Development (#419)
olasunkanmi-SE Nov 14, 2023
c68292a
Merge branch 'main' into release
olasunkanmi-SE Nov 14, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions backend/src/application/constants/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,5 @@ export const TYPES = {
IOrderService: Symbol('IOrderService'),
ICartItemRepository: Symbol('ICartItemRepository'),
IOrderStatusRepository: Symbol('IOrderStatusRepository'),
IOrderStatusService: Symbol('IOrderStatusService'),
};
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { BaseDocument } from 'src/infrastructure/database';
import { IOrderStatusModel } from '../models/order-status-model.interface';
import { Prop } from '@nestjs/mongoose';
import { Prop, SchemaFactory } from '@nestjs/mongoose';
import mongoose, { Document } from 'mongoose';
import { OrderDataModel } from './order.schema';
import { Type } from 'class-transformer';
Expand All @@ -23,3 +23,5 @@ export class OrderStatusModel extends BaseDocument implements IOrderStatusModel
@Type(() => OrderDataModel)
orders?: OrderDataModel[];
}

export const OrderStatusSchema = SchemaFactory.createForClass(OrderStatusModel);
7 changes: 4 additions & 3 deletions backend/src/order_statuses/order_statuses.controller.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import { Body, Controller, Get, Post } from '@nestjs/common';
import { Body, Controller, Get, Inject, Post } from '@nestjs/common';
import { TYPES } from 'src/application';
import { CreateOrderStatusDto } from './dto/create-order_status.dto';
import { OrderStatusesService } from './order_statuses.service';
import { IOrderStatusService } from './interface/order-status-service.interface';

@Controller('order-statuses')
export class OrderStatusesController {
constructor(private readonly orderStatusesService: OrderStatusesService) {}
constructor(@Inject(TYPES.IOrderStatusService) private readonly orderStatusesService: IOrderStatusService) {}

@Post()
create(@Body() createOrderStatusDto: CreateOrderStatusDto) {
Expand Down
21 changes: 19 additions & 2 deletions backend/src/order_statuses/order_statuses.module.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,26 @@
import { Module } from '@nestjs/common';
import { OrderStatusesService } from './order_statuses.service';
import { OrderStatusService } from './order_statuses.service';
import { OrderStatusesController } from './order_statuses.controller';
import { TYPES } from 'src/application';
import { OrderStatusRepository } from 'src/infrastructure/data_access/repositories/order-status.repository';
import { ContextService } from 'src/infrastructure';
import { MongooseModule } from '@nestjs/mongoose';
import {
OrderStatusModel,
OrderStatusSchema,
} from 'src/infrastructure/data_access/repositories/schemas/order-status.schema';
import { OrderStatusMapper } from './order_status.mapper';
import { AuditMapper } from 'src/audit';

@Module({
imports: [MongooseModule.forFeature([{ name: OrderStatusModel.name, schema: OrderStatusSchema }])],
controllers: [OrderStatusesController],
providers: [OrderStatusesService]
providers: [
{ provide: TYPES.IOrderStatusService, useClass: OrderStatusService },
{ provide: TYPES.IOrderStatusRepository, useClass: OrderStatusRepository },
{ provide: TYPES.IContextService, useClass: ContextService },
OrderStatusMapper,
AuditMapper,
],
})
export class OrderStatusesModule {}
2 changes: 1 addition & 1 deletion backend/src/order_statuses/order_statuses.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { OrderStatus } from './order_status';
import { OrderStatusParser } from './order_status_parser';

@Injectable()
export class OrderStatusesService implements IOrderStatusService {
export class OrderStatusService implements IOrderStatusService {
private context: Context;
constructor(
@Inject(TYPES.IOrderStatusRepository) private readonly orderStatusRepository: IOrderStatusRespository,
Expand Down