Merge branch 'develop' into feat/add-metrics

.dockerignore

@@ -2,4 +2,9 @@ node_modules
 docker-compose.yml
 .git
 .gitignore
-.env*
+.env*
+Dockerfile
+.dockerignore
+node_modules
+npm-debug.log
+dist

.gitignore

@@ -31,6 +31,7 @@ lerna-debug.log*
 *.launch
 .settings/
 *.sublime-workspace
+/.vscode
 
 # IDE - VSCode
 .vscode/*

Dockerfile

@@ -12,6 +12,4 @@ RUN yarn build
 
 EXPOSE 3000
 
-CMD ["yarn", "start"]
-
-
+CMD ["yarn", "start"]

docker-compose.yml

@@ -18,19 +18,6 @@ services:
       MYSQL_USER: 'api'
       MYSQL_PASSWORD: 'api'
 
-  wordpress:
-    depends_on:
-      - db
-    image: wordpress:latest
-    ports:
-      - "8000:80"
-    volumes:
-      - ./html:/var/www/html
-    environment:
-      WORDPRESS_DB_HOST: db:3306
-      WORDPRESS_DB_USER: api
-      WORDPRESS_DB_PASSWORD: api
-      WORDPRESS_DB_NAME: api
   prometheus:
     image: bitnami/prometheus
     ports:
@@ -62,4 +49,20 @@ services:
       - JAMIE_API_DATABASE_USER=api
       - JAMIE_API_DATABASE_PASSWORD=api
 
+  jaeger:
+    image: jaegertracing/all-in-one:1.41
+    environment:
+      COLLECTOR_ZIPKIN_HOST_PORT: :9411 
+      COLLECTOR_OTLP_ENABLED: true 
+    ports: 
+      - 14250:14250
+      - 14268:14268
+      - 14269:14269
+      - 16686:16686
+      - 4317:4317
+      - 4318:4318
+      - 5778:5778
+      - 6831:6831 
+      - 6832:6832 
+      - 9411:9411
 

package.json

@@ -31,6 +31,11 @@
     "@nestjs/platform-express": "^9.0.0",
     "@nestjs/typeorm": "^9.0.1",
     "@willsoto/nestjs-prometheus": "^5.1.0",
+    "@opentelemetry/auto-instrumentations-node": "^0.36.0",
+    "@opentelemetry/exporter-trace-otlp-http": "^0.34.0",
+    "@opentelemetry/resources": "^1.8.0",
+    "@opentelemetry/sdk-node": "^0.34.0",
+    "@opentelemetry/semantic-conventions": "^1.8.0",
     "apollo-server-express": "^3.11.1",
     "graphql": "^16.6.0",
     "mysql2": "^2.3.3",

src/main.ts

@@ -1,8 +1,13 @@
 import { NestFactory } from '@nestjs/core';
 import { AppModule } from './app.module';
+import tracer from './tracer';
+
+const { PORT = 5000 } = process.env;
 
 async function bootstrap() {
+  await tracer.start();
+
   const app = await NestFactory.create(AppModule);
-  await app.listen(3000);
+  await app.listen(PORT);
 }
 bootstrap();

src/menu-items/dto/menu-item.input.ts

@@ -0,0 +1,32 @@
+import { Field, InputType, Int } from '@nestjs/graphql';
+import { GraphQLJSONObject } from 'src/common/graphql/types/json.type';
+
+export enum MenuItemAction {
+  CREATE = 'create',
+  UPDATE = 'update',
+  DELETE = 'delete',
+}
+
+@InputType()
+export class MenuItemInput {
+  @Field(() => Int, { nullable: true })
+  id?: number;
+
+  @Field()
+  label: string;
+
+  @Field()
+  action: MenuItemAction;
+
+  @Field(() => Int)
+  order: number;
+
+  @Field(() => Int, { nullable: true })
+  parentId?: number;
+
+  @Field(() => [MenuItemInput], { nullable: true })
+  children?: MenuItemInput[];
+
+  @Field(() => GraphQLJSONObject, { nullable: true })
+  meta?: object;
+}

src/menu-items/entities/menu-item.entity.ts

@@ -29,18 +29,18 @@ export class MenuItem {
   meta?: object;
 
   @Field(() => MenuItem, { nullable: true })
-  @OneToMany(() => MenuItem, (menuItem) => menuItem.parent)
-  children?: MenuItem[];
+  @OneToMany(() => MenuItem, (menuItem) => menuItem.parent, { lazy: true })
+  children?: Promise<MenuItem[]>;
 
-  @ManyToOne(() => MenuItem, (menuItem) => menuItem.children)
+  @ManyToOne(() => MenuItem, (menuItem) => menuItem.children, { lazy: true })
   @JoinColumn()
-  parent?: MenuItem;
+  parent?: Promise<MenuItem>;
 
   @Field(() => Int, { nullable: true })
   @Column({ nullable: true })
   parentId?: number;
 
-  @ManyToOne(() => Menu, (menu) => menu.items)
+  @ManyToOne(() => Menu, (menu) => menu.items, { lazy: true })
   @JoinColumn()
-  menu?: Menu;
+  menu?: Promise<Menu>;
 }

src/menu-items/menu-items.module.ts

@@ -1,7 +1,10 @@
 import { Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
+import { MenuItem } from './entities/menu-item.entity';
 import { MenuItemsService } from './menu-items.service';
 
 @Module({
+  imports: [TypeOrmModule.forFeature([MenuItem])],
   providers: [MenuItemsService],
   exports: [MenuItemsService],
 })

src/menu-items/menu-items.service.ts

@@ -1,26 +1,59 @@
 import { Injectable } from '@nestjs/common';
-import { CreateMenuItemInput } from './dto/create-menu-item.input';
-import { UpdateMenuItemInput } from './dto/update-menu-item.input';
+import { InjectRepository } from '@nestjs/typeorm';
+import { Menu } from 'src/menus/entities/menu.entity';
+import { Repository } from 'typeorm';
+import { MenuItemAction, MenuItemInput } from './dto/menu-item.input';
+import { MenuItem } from './entities/menu-item.entity';
 
 @Injectable()
 export class MenuItemsService {
-  create(createMenuInput: CreateMenuItemInput) {
+  constructor(
+    @InjectRepository(MenuItem)
+    private menuItemRepository: Repository<MenuItem>,
+  ) {}
+  create(createMenuInput: MenuItemInput) {
     return 'This action adds a new menu item';
   }
 
   findAll(query: any) {
-    return `This action returns all menu items`;
+    // return `This action returns all menu items`;
+    return this.menuItemRepository.find({
+      where: [{ menu: { id: query.menuId } }],
+    });
   }
 
   findOne(id: number) {
     return `This action returns a #${id} menu item`;
   }
 
-  update(id: number, updateMenuInput: UpdateMenuItemInput) {
+  update(id: number, updateMenuInput: MenuItemInput) {
     return `This action updates a #${id} menu item`;
   }
 
   remove(id: number) {
     return `This action removes a #${id} menu item`;
   }
+
+  handle(menu: Menu, input: MenuItemInput) {
+    if (
+      input.action == MenuItemAction.CREATE ||
+      input.action == MenuItemAction.UPDATE
+    ) {
+      const item = new MenuItem();
+
+      item.id = input.id;
+      item.label = input.label;
+      item.order = input.order;
+      item.menu = Promise.resolve(menu);
+
+      return this.menuItemRepository.save(item);
+    }
+
+    if (input.action == MenuItemAction.DELETE) {
+      this.menuItemRepository.delete(input.id);
+      return;
+    }
+
+    throw new Error('unexpected action');
+  }
 }

src/menus/dto/create-menu.input.ts

@@ -1,7 +1,11 @@
-import { InputType, Field } from '@nestjs/graphql';
+import { Field, InputType } from '@nestjs/graphql';
+import { MenuItemInput } from 'src/menu-items/dto/menu-item.input';
 
 @InputType()
 export class CreateMenuInput {
   @Field()
   name: string;
+
+  @Field(() => [MenuItemInput], { nullable: true })
+  items?: MenuItemInput[];
 }

src/menus/dto/update-menu.input.ts

@@ -1,5 +1,5 @@
+import { Field, InputType, Int, PartialType } from '@nestjs/graphql';
 import { CreateMenuInput } from './create-menu.input';
-import { InputType, Field, Int, PartialType } from '@nestjs/graphql';
 
 @InputType()
 export class UpdateMenuInput extends PartialType(CreateMenuInput) {

src/menus/entities/menu.entity.ts

@@ -14,6 +14,6 @@ export class Menu {
   name: string;
 
   @Field(() => [MenuItem], { nullable: true })
-  @OneToMany(() => MenuItem, (menuItem) => menuItem.menu)
-  items?: MenuItem[];
+  @OneToMany(() => MenuItem, (menuItem) => menuItem.menu, { lazy: true })
+  items?: Promise<MenuItem[]>;
 }

src/menus/menus.module.ts

@@ -2,9 +2,11 @@ import { Module } from '@nestjs/common';
 import { MenusService } from './menus.service';
 import { MenusResolver } from './menus.resolver';
 import { MenuItemsModule } from 'src/menu-items/menu-items.module';
+import { Menu } from './entities/menu.entity';
+import { TypeOrmModule } from '@nestjs/typeorm';
 
 @Module({
-  imports: [MenuItemsModule],
+  imports: [TypeOrmModule.forFeature([Menu]), MenuItemsModule],
   providers: [MenusResolver, MenusService],
 })
 export class MenusModule {}

src/menus/menus.resolver.ts

@@ -16,10 +16,7 @@ import { MenuItem } from 'src/menu-items/entities/menu-item.entity';
 
 @Resolver(() => Menu)
 export class MenusResolver {
-  constructor(
-    private readonly menusService: MenusService,
-    private readonly menuItemsService: MenuItemsService,
-  ) {}
+  constructor(private readonly menusService: MenusService) {}
 
   @Mutation(() => Menu)
   createMenu(@Args('createMenuInput') createMenuInput: CreateMenuInput) {
@@ -41,14 +38,18 @@ export class MenusResolver {
     return this.menusService.update(updateMenuInput.id, updateMenuInput);
   }
 
-  @Mutation(() => Menu)
-  removeMenu(@Args('id', { type: () => Int }) id: number) {
-    return this.menusService.remove(id);
-  }
+  @Mutation(() => Boolean)
+  async removeMenu(@Args('id', { type: () => Int }) id: number) {
+    //return this.menusService.remove(id);
+    await this.menusService.remove(id);
 
-  @ResolveField('items', () => [MenuItem])
-  getItems(@Parent() menu: Menu) {
-    const { id } = menu;
-    return this.menuItemsService.findAll({ menuId: id });
+    return true;
   }
+
+  // @ResolveField('items', () => [MenuItem])
+  // getItems(@Parent() menu: Menu) {
+  //   //const { id } = menu;
+  //   //return this.menuItemsService.findAll({ menuId: id });
+  //   return menu.items;
+  // }
 }

src/menus/menus.service.spec.ts

@@ -1,15 +1,20 @@
 import { Test, TestingModule } from '@nestjs/testing';
+import { getRepositoryToken } from '@nestjs/typeorm';
+import { Repository } from 'typeorm';
+import { Menu } from './entities/menu.entity';
 import { MenusService } from './menus.service';
 
 describe('MenusService', () => {
   let service: MenusService;
+  let repository: Repository<Menu>;
 
   beforeEach(async () => {
     const module: TestingModule = await Test.createTestingModule({
       providers: [MenusService],
     }).compile();
 
     service = module.get<MenusService>(MenusService);
+    repository = module.get<Repository<Menu>>(getRepositoryToken(Menu));
   });
 
   it('should be defined', () => {