From 16e0e4f9d83257702084b75c1beae924a95de5a4 Mon Sep 17 00:00:00 2001 From: "pakintada@gmail.com" Date: Fri, 2 Feb 2024 17:07:49 +0700 Subject: [PATCH] add topping WIP --- client/src/app/app-routing.module.ts | 13 +- .../src/app/core/layout/layout.component.ts | 10 +- client/src/app/core/models/recipe.model.ts | 2 +- .../src/app/core/services/topping.service.ts | 71 ++++++-- .../material-settings.component.html | 2 +- .../features/toppings/toppings.component.html | 39 ++++ .../features/toppings/toppings.component.ts | 168 ++++++++++++++++++ server/data/data.go | 106 ++++++++++- server/routers/topping.go | 69 +++++++ server/server.go | 4 + server/services/recipe/recipe.go | 2 + 11 files changed, 460 insertions(+), 26 deletions(-) create mode 100644 client/src/app/features/toppings/toppings.component.html create mode 100644 client/src/app/features/toppings/toppings.component.ts create mode 100644 server/routers/topping.go diff --git a/client/src/app/app-routing.module.ts b/client/src/app/app-routing.module.ts index e6879bd..cfd77d5 100644 --- a/client/src/app/app-routing.module.ts +++ b/client/src/app/app-routing.module.ts @@ -141,10 +141,17 @@ const routes: Routes = [ { path: 'materials', loadComponent: () => - import('./features/material-settings/material-settings.component').then( - (m) => m.MaterialSettingsComponent + import( + './features/material-settings/material-settings.component' + ).then((m) => m.MaterialSettingsComponent), + }, + { + path: 'toppings', + loadComponent: () => + import('./features/toppings/toppings.component').then( + (t) => t.ToppingsComponent ), - } + }, ], }, { diff --git a/client/src/app/core/layout/layout.component.ts b/client/src/app/core/layout/layout.component.ts index bfa31d3..1478473 100644 --- a/client/src/app/core/layout/layout.component.ts +++ b/client/src/app/core/layout/layout.component.ts @@ -34,15 +34,15 @@ export class LayoutComponent implements OnInit, OnDestroy { icon_url: 'assets/icons/recipes.svg', link: '/' + this.current_department + '/recipes', }, - { - name: 'Log', - icon_url: 'assets/icons/logs.svg', - link: '/' + this.current_department + '/log', - }, { name: 'Materials', icon_url: '', link: '/' + this.current_department + '/materials', + }, + { + name: 'Toppings', + icon_url: '', + link: '/' + this.current_department + '/toppings' } ]; date = new Date(); diff --git a/client/src/app/core/models/recipe.model.ts b/client/src/app/core/models/recipe.model.ts index 09de8aa..02016b3 100644 --- a/client/src/app/core/models/recipe.model.ts +++ b/client/src/app/core/models/recipe.model.ts @@ -113,7 +113,7 @@ export interface ToppingGroup { groupID: string; idDefault: string; idInGroup: string; - inUse: string; + inUse: boolean; name: string; otherName: string; } diff --git a/client/src/app/core/services/topping.service.ts b/client/src/app/core/services/topping.service.ts index 22d1ca5..2db4395 100644 --- a/client/src/app/core/services/topping.service.ts +++ b/client/src/app/core/services/topping.service.ts @@ -2,7 +2,7 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { Observable, count } from 'rxjs'; import { environment } from 'src/environments/environment'; -import { Topping, ToppingSet } from '../models/recipe.model'; +import { Topping, ToppingGroup, ToppingList, ToppingSet } from '../models/recipe.model'; import { RecipeService } from './recipe.service'; import { getCountryMapSwitcher } from 'src/app/shared/helpers/recipe'; @@ -10,13 +10,19 @@ import { getCountryMapSwitcher } from 'src/app/shared/helpers/recipe'; providedIn: 'root', }) export class ToppingService { - constructor(private _httpClient: HttpClient, private _recipeService: RecipeService) {} + constructor( + private _httpClient: HttpClient, + private _recipeService: RecipeService + ) {} - async getToppings(country: string, filename: string): Promise> { - console.log("getToppings", country); + async getToppings( + country: string, + filename: string + ): Promise> { + console.log('getToppings', country); let asyncCountry = await this._recipeService.getCurrentCountry(); country = getCountryMapSwitcher(asyncCountry); - console.log("getToppingsPreFetch", country, asyncCountry); + console.log('getToppingsPreFetch', country, asyncCountry); return this._httpClient.get( `${environment.api}/recipes/${country}/${filename}/toppings`, { @@ -24,16 +30,20 @@ export class ToppingService { country: country, filename: filename, }, - withCredentials: true + withCredentials: true, } ); } - async getToppingsOfRecipe(country: string, filename: string, productCode: string): Promise> { - console.log("getToppingsOfRecipe", country); + async getToppingsOfRecipe( + country: string, + filename: string, + productCode: string + ): Promise> { + console.log('getToppingsOfRecipe', country); let asyncCountry = await this._recipeService.getCurrentCountry(); country = country || asyncCountry; - console.log("getToppingsOfRecipePreFetch", country, asyncCountry); + console.log('getToppingsOfRecipePreFetch', country, asyncCountry); return this._httpClient.get( `${environment.api}/recipes/${country}/${filename}/${productCode}/toppings`, { @@ -41,8 +51,49 @@ export class ToppingService { country: country, filename: filename, }, - withCredentials: true + withCredentials: true, } ); } + + async getToppingGroups( + country: string, + filename: string + ): Promise> { + console.log('fetching topping group'); + let asyncCountry = await this._recipeService.getCurrentCountry(); + country = getCountryMapSwitcher(asyncCountry); + + return this._httpClient.get( + `${environment.api}/toppings/groups/${country}/${filename}`, + { + params:{ + country: country, + filename: filename + }, + withCredentials: true, + } + ); + } + + async getToppingLists( + country: string, + filename: string + ): Promise> { + console.log('fetching topping list'); + let asyncCountry = await this._recipeService.getCurrentCountry(); + country = getCountryMapSwitcher(asyncCountry); + + return this._httpClient.get( + `${environment.api}/toppings/lists/${country}/${filename}`, + { + params:{ + country: country, + filename: filename + }, + withCredentials: true, + } + ); + } + } diff --git a/client/src/app/features/material-settings/material-settings.component.html b/client/src/app/features/material-settings/material-settings.component.html index 03825c9..d75d589 100644 --- a/client/src/app/features/material-settings/material-settings.component.html +++ b/client/src/app/features/material-settings/material-settings.component.html @@ -39,7 +39,7 @@

Material Settings

- +

{{ currentMaterialSettings.materialName }}

diff --git a/client/src/app/features/toppings/toppings.component.html b/client/src/app/features/toppings/toppings.component.html new file mode 100644 index 0000000..2260617 --- /dev/null +++ b/client/src/app/features/toppings/toppings.component.html @@ -0,0 +1,39 @@ +
+ + + + + + + + + + + + + + + + + + + + + + + + +
Is UseIDNameOther NameDesciptionDefault
+
+ +
+ +
+
diff --git a/client/src/app/features/toppings/toppings.component.ts b/client/src/app/features/toppings/toppings.component.ts new file mode 100644 index 0000000..51c1f4b --- /dev/null +++ b/client/src/app/features/toppings/toppings.component.ts @@ -0,0 +1,168 @@ +import { Component, OnInit } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { HttpClient } from '@angular/common/http'; +import { ToppingService } from 'src/app/core/services/topping.service'; +import { ToppingGroup, ToppingList } from 'src/app/core/models/recipe.model'; +import { RecipeService } from 'src/app/core/services/recipe.service'; +import { + FormArray, + FormBuilder, + FormGroup, + FormsModule, + ReactiveFormsModule, +} from '@angular/forms'; +import { NgSelectModule } from '@ng-select/ng-select'; + +@Component({ + selector: 'app-toppings', + standalone: true, + imports: [CommonModule, NgSelectModule,FormsModule, ReactiveFormsModule], + templateUrl: './toppings.component.html', +}) +export class ToppingsComponent implements OnInit { + // topping group + toppingGroupList: ToppingGroup[] = []; + toppingLists: ToppingList[] = []; + + groupMemebersMap: { [key: string]: { [key: string]: any } } = { + '0': { members: [] }, + }; + + // forms + + toppingGroupForm = this._formBuilder.group( + { + toppingGroup: this._formBuilder.array([]), + }, + { updateOn: 'blur' } + ); + + get toppingGroup(): FormArray { + return this.toppingGroupForm.get('toppingGroup') as FormArray; + } + + // ---------------------------------------------------------------------------- + + constructor( + private _httpClient: HttpClient, + private _recipeService: RecipeService, + private _toppingService: ToppingService, + private _formBuilder: FormBuilder + ) {} + + async ngOnInit(): Promise { + // initialize + ( + await this._toppingService.getToppingGroups( + await this._recipeService.getCurrentCountry(), + this._recipeService.getCurrentFile() + ) + ).subscribe((data) => { + // sort by group id + data.sort((a, b) => parseInt(a.groupID) - parseInt(b.groupID)); + + this.toppingGroupList = data; + this.mapMembers(); + console.log( + 'topping groups: ', + this.toppingGroupList, + 'mapper:', + this.groupMemebersMap, + 'length', + this.toppingGroupList.length + ); + + // do push to form + data.forEach((tg) => { + this.toppingGroup.push( + this._formBuilder.group({ + Desc: tg.Desc, + name: tg.name, + otherName: tg.otherName, + groupID: tg.groupID, + idInGroup: tg.idInGroup, + idDefault: tg.idDefault, + inUse: tg.inUse, + }) + ); + }); + + console.log('create topping group form', this.toppingGroup); + }); + + ( + await this._toppingService.getToppingLists( + await this._recipeService.getCurrentCountry(), + this._recipeService.getCurrentFile() + ) + ).subscribe((data) => { + this.toppingLists = data; + this.mapNameToMember(); + + console.log( + 'get topping list', + this.toppingLists, + 'mapper:', + this.groupMemebersMap + ); + + console.log('undefined name of topping list', this.findUndefinedName()); + }); + } + + // -------------------------------------- Functions ------------------------------------------- + + // mapping member to group + mapMembers = () => { + this.toppingGroupList.forEach((tpg) => { + let spl_mem = tpg.idInGroup.split(','); + this.groupMemebersMap[tpg.groupID] = { members: spl_mem }; + }); + }; + + // get members of group id + getMemberByGroupId = (id: string) => + this.groupMemebersMap[id]['members'] as string[]; + + // match name to member + mapNameToMember = () => { + if (this.toppingLists.length > 0) { + this.toppingGroupList.forEach((tpg) => { + let members = this.groupMemebersMap[tpg.groupID]['members']; + members.forEach((member_id: string) => { + // do get member data from topping list + let member_data = this.toppingLists.find( + (v) => v.id.toString() == member_id.toString() + ); + // set data to group + this.groupMemebersMap[tpg.groupID][member_id] = member_data; + }); + }); + } + }; + + // get member data from group + getMemberData = (group: string, member_id: string) => { + if (this.groupMemebersMap[group][member_id] == undefined) { + return {}; + } + return this.groupMemebersMap[group][member_id]; + }; + + // check which list does not have name + findUndefinedName = () => + this.toppingLists.filter((tl) => tl.name == '' || tl.name == undefined); + + // get with default value + returnThisOrElse = (value: any, default_value: any) => + value == undefined || value == '' ? default_value : value; + + // get value from form by given key + getAttrFromForm(index: number, key: string){ + let x = this.toppingGroup.controls.at(index) as any; + return x.value[key]; + } + + // diff and find matched + comapareFunction = (a: any, b: any) => ( a != undefined && b != undefined)&& (a.toString() === b.toString()); +} diff --git a/server/data/data.go b/server/data/data.go index 8209ffb..102ae8a 100644 --- a/server/data/data.go +++ b/server/data/data.go @@ -267,10 +267,10 @@ func (d *Data) GetRecipe01ByProductCode(filename, countryID, productCode string) if !strings.Contains(filename, "tmp") { if filename == "" || filename == d.CurrentFile[countryID] { // , d.CurrentFile, countryID, "result by country id", len(d.currentRecipe[countryID].Recipe01) - fmt.Println("GetRecipe01ByProductCode.ReadCurrent::filename", filename) - fmt.Println("GetRecipe01ByProductCode.ReadCurrent::countryID", countryID) - fmt.Println("GetRecipe01ByProductCode.ReadCurrent::CurrentFile", d.CurrentFile) - fmt.Println("GetRecipe01ByProductCode.ReadCurrent::CurrentCountryID", d.CurrentCountryID) + // fmt.Println("GetRecipe01ByProductCode.ReadCurrent::filename", filename) + // fmt.Println("GetRecipe01ByProductCode.ReadCurrent::countryID", countryID) + // fmt.Println("GetRecipe01ByProductCode.ReadCurrent::CurrentFile", d.CurrentFile) + // fmt.Println("GetRecipe01ByProductCode.ReadCurrent::CurrentCountryID", d.CurrentCountryID) for _, v := range d.currentRecipe[countryID].Recipe01 { if v.ProductCode == productCode { @@ -283,9 +283,9 @@ func (d *Data) GetRecipe01ByProductCode(filename, countryID, productCode string) } } } - fmt.Println("No result in current recipe", countryID) + // fmt.Println("No result in current recipe", countryID) } else if recipe, ok := d.recipeMap[filename]; ok { - fmt.Println("GetRecipe01ByProductCode.ReadMap", filename, d.CurrentFile, recipe.Recipe[countryID], "countryID=", countryID) + // fmt.Println("GetRecipe01ByProductCode.ReadMap", filename, d.CurrentFile, recipe.Recipe[countryID], "countryID=", countryID) for _, v := range recipe.Recipe[countryID].Recipe01 { if v.ProductCode == productCode { d.taoLogger.Log.Debug("GetRecipe01ByProductCode.getSuccess", zap.Any("fromFile", filename), zap.Any("whereSource", d.recipeMap)) @@ -499,6 +499,100 @@ func (d *Data) GetMaterialSetting(countryID, filename string) []models.MaterialS return recipe.MaterialSetting } +func (d *Data) GetAllToppingGroups(countryID, filename string) []models.ToppingGroup { + if countryID == "" { + return d.currentRecipe[countryID].Topping.ToppingGroup + } + + if !strings.Contains(filename, ".tmp") { + if filename == "" || filename == d.CurrentFile[countryID] { + return d.currentRecipe[countryID].Topping.ToppingGroup + } + if _, ok := d.recipeMap[countryID]; ok { + d.CurrentFile[countryID] = filename + + return d.currentRecipe[countryID].Topping.ToppingGroup + } + } + + if filename == "default" { + filename = d.CurrentFile[countryID] + } + recipe, err := helpers.ReadRecipeFile(countryID, filename) + if err != nil { + return d.currentRecipe[countryID].Topping.ToppingGroup + } + + d.currentRecipe[countryID] = recipe + + if len(d.recipeMap) > 5 { // limit keep in memory 5 version + // remove oldest version + var oldestVersion string + var oldestTime int64 + for k, v := range d.recipeMap { + if oldestTime == 0 || v.TimeStamps < oldestTime { + oldestTime = v.TimeStamps + oldestVersion = k + } + } + delete(d.recipeMap, oldestVersion) + } + + d.recipeMap[filename] = RecipeWithTimeStamps{ + Recipe: d.currentRecipe, + TimeStamps: time.Now().Unix(), + } + + return recipe.Topping.ToppingGroup +} + +func (d *Data) GetToppingsList(countryID, filename string) []models.ToppingList { + // do return default + if countryID == "" { + return d.currentRecipe[countryID].Topping.ToppingList + } + + // handle temporary file + if !strings.Contains(filename, ".tmp") { + if filename == "" || filename == d.CurrentFile[countryID] { + return d.currentRecipe[countryID].Topping.ToppingList + } + if _, ok := d.recipeMap[countryID]; ok { + d.CurrentFile[countryID] = filename + return d.currentRecipe[countryID].Topping.ToppingList + } + } + + if filename == "default" { + filename = d.CurrentFile[countryID] + } + + recipe, err := helpers.ReadRecipeFile(countryID, filename) + if err != nil { + return d.currentRecipe[countryID].Topping.ToppingList + } + + if len(d.recipeMap) > 5 { // limit keep in memory 5 version + // remove oldest version + var oldestVersion string + var oldestTime int64 + for k, v := range d.recipeMap { + if oldestTime == 0 || v.TimeStamps < oldestTime { + oldestTime = v.TimeStamps + oldestVersion = k + } + } + delete(d.recipeMap, oldestVersion) + } + + d.recipeMap[filename] = RecipeWithTimeStamps{ + Recipe: d.currentRecipe, + TimeStamps: time.Now().Unix(), + } + + return recipe.Topping.ToppingList +} + func (d *Data) GetMaterialCode(ids []uint64, countryID, filename string) []models.MaterialCode { var result []models.MaterialCode diff --git a/server/routers/topping.go b/server/routers/topping.go new file mode 100644 index 0000000..d9be814 --- /dev/null +++ b/server/routers/topping.go @@ -0,0 +1,69 @@ +package routers + +import ( + "encoding/json" + "net/http" + "recipe-manager/data" + "recipe-manager/services/logger" + + "github.com/go-chi/chi/v5" + "go.uber.org/zap" +) + +// this does different from normal topping fetcher in recipe + +type ToppingRouter struct { + data *data.Data + taoLogger *logger.TaoLogger +} + +func NewToppingRouter(data *data.Data, taoLogger *logger.TaoLogger) *ToppingRouter { + return &ToppingRouter{ + data: data, + taoLogger: taoLogger, + } +} + +func (tr *ToppingRouter) Route(r chi.Router) { + r.Route("/toppings", func(r chi.Router) { + r.Get("/groups/{country}/{filename}", tr.GetToppingGroups) + r.Get("/lists/{country}/{filename}", tr.GetToppingLists) + }) +} + +// get all topping group +func (tr *ToppingRouter) GetToppingGroups(w http.ResponseWriter, r *http.Request) { + w.Header().Add("Content-Type", "application/json") + + // just in case: params country and filename + country := chi.URLParam(r, "country") + filename := chi.URLParam(r, "filename") + + // get topping groups + toppingGroups := tr.data.GetAllToppingGroups(country, filename) + + // send without new mapping + + if err := json.NewEncoder(w).Encode(toppingGroups); err != nil { + tr.taoLogger.Log.Error("ToppingRouter.GetToppingGroups", zap.Error(err)) + http.Error(w, "Internal Error", http.StatusInternalServerError) + + return + } +} + +func (tr *ToppingRouter) GetToppingLists(w http.ResponseWriter, r *http.Request) { + w.Header().Add("Content-Type", "application/json") + + country := chi.URLParam(r, "country") + filename := chi.URLParam(r, "filename") + + // get toppping list + toppingLists := tr.data.GetToppingsList(country, filename) + + if err := json.NewEncoder(w).Encode(toppingLists); err != nil { + tr.taoLogger.Log.Debug("ToppingRouter.GetToppingLists", zap.Error(err)) + http.Error(w, "Internal Error", http.StatusInternalServerError) + return + } +} diff --git a/server/server.go b/server/server.go index b2a4571..f80feef 100644 --- a/server/server.go +++ b/server/server.go @@ -151,6 +151,10 @@ func (s *Server) createHandler() { ur := routers.NewUserRouter(s.taoLogger, userService) ur.Route(r) + // Topping Router + tr := routers.NewToppingRouter(s.data, s.taoLogger) + tr.Route(r) + }) r.NotFound(func(w http.ResponseWriter, r *http.Request) { diff --git a/server/services/recipe/recipe.go b/server/services/recipe/recipe.go index eb63eac..089b96c 100644 --- a/server/services/recipe/recipe.go +++ b/server/services/recipe/recipe.go @@ -197,6 +197,8 @@ func (rs *recipeService) GetRecipeDashboard(request *contracts.RecipeDashboardRe } } + rs.taoLogger.Log.Debug("RecipeDashboard", zap.String("Timestamp", recipe.Timestamp)) + result := contracts.RecipeDashboardResponse{ ConfigNumber: recipe.MachineSetting.ConfigNumber, LastUpdated: recipe.Timestamp,