diff --git a/apps/backend/db_handler.go b/apps/backend/db_handler.go index 2cebe91..841e8bd 100644 --- a/apps/backend/db_handler.go +++ b/apps/backend/db_handler.go @@ -2,6 +2,7 @@ package main import ( "backend/dbhelpers" + "backend/typedefs" "context" "fmt" "log/slog" @@ -61,16 +62,16 @@ func (h *DbHandler) GetActiveAnnunci() []string { return annunci } -func (h *DbHandler) GetAllAnnunci() []AnnunciDB { +func (h *DbHandler) GetAllAnnunci() []typedefs.AnnunciDB { //var annuncio AnnunciDB - var annunci []AnnunciDB + var annunci []typedefs.AnnunciDB pgxscan.Select(h.Ctx, h.Dbpool, &annunci, "SELECT * FROM public.annunci") return annunci } -func (h *DbHandler) InsertAnnunciInDB(annunci AnnunciParsed) { +func (h *DbHandler) InsertAnnunciInDB(annunci typedefs.AnnunciParsed) { //SET ALL WEB TO FALSE _, err := h.Dbpool.Exec(h.Ctx, "UPDATE public.annunci SET web = false") @@ -243,7 +244,7 @@ func (h *DbHandler) ClearRecords() { } } -func (h *DbHandler) SetFromBkp(annunci AnnunciParsed) { +func (h *DbHandler) SetFromBkp(annunci typedefs.AnnunciParsed) { h.ClearRecords() batch := &pgx.Batch{} diff --git a/apps/backend/from_bkp.go b/apps/backend/from_bkp.go index d5c57b6..e1fa8d6 100644 --- a/apps/backend/from_bkp.go +++ b/apps/backend/from_bkp.go @@ -1,6 +1,7 @@ package main import ( + "backend/typedefs" "encoding/xml" "fmt" "io" @@ -10,7 +11,7 @@ import ( "time" ) -func From_Backup() XmlBkp { +func From_Backup() typedefs.XmlBkp { //open the bkp.xml file xmlFile, err := os.Open("bkp.xml") if err != nil { @@ -22,18 +23,18 @@ func From_Backup() XmlBkp { if err != nil { fmt.Println(err) } - var miogest XmlBkp + var miogest typedefs.XmlBkp xml.Unmarshal(byteValue, &miogest) return miogest } -func ParseUpdateBkp() AnnunciParsed { +func ParseUpdateBkp() typedefs.AnnunciParsed { miogest := From_Backup() - var AnnunciArray AnnunciParsed - extractedData := make(chan AnnuncioParsed) + var AnnunciArray typedefs.AnnunciParsed + extractedData := make(chan typedefs.AnnuncioParsed) defaultCaratteristiche := Miogest.GetCaratteristiche() defaultCategorie := Miogest.GetCategorie() @@ -59,9 +60,9 @@ func ParseUpdateBkp() AnnunciParsed { return AnnunciArray } -func extractData_bkp(annuncio AnnuncioBKP, extractedData chan AnnuncioParsed, defaultCaratteristiche ListaCaratteristiche, defaultCategorie []Categoria) { +func extractData_bkp(annuncio typedefs.AnnuncioBKP, extractedData chan typedefs.AnnuncioParsed, defaultCaratteristiche typedefs.ListaCaratteristiche, defaultCategorie []typedefs.Categoria) { - var tmp AnnuncioParsed = AnnuncioParsed{} + var tmp typedefs.AnnuncioParsed = typedefs.AnnuncioParsed{} codice := RemoveWhitespace(GetStringValue(annuncio.Codice)) tmp.Codice = codice diff --git a/apps/backend/image_handler.go b/apps/backend/image_handler.go index f916a6e..7b9b1be 100644 --- a/apps/backend/image_handler.go +++ b/apps/backend/image_handler.go @@ -1,6 +1,7 @@ package main import ( + "backend/typedefs" "fmt" "log" "os" @@ -17,9 +18,9 @@ func NewImageRefManager() *ImageRefManager { return &ImageRefManager{} } -func (i *ImageRefManager) GetImagesRef() ([]MiogestImagesRef_Table, error) { +func (i *ImageRefManager) GetImagesRef() ([]typedefs.MiogestImagesRef_Table, error) { - var images []MiogestImagesRef_Table + var images []typedefs.MiogestImagesRef_Table err := pgxscan.Select(Db.Ctx, Db.Dbpool, &images, "SELECT * FROM public.miogest_images_ref") if err != nil { @@ -29,7 +30,7 @@ func (i *ImageRefManager) GetImagesRef() ([]MiogestImagesRef_Table, error) { return images, nil } -func (i *ImageRefManager) InsertImagesRef(annunci *AnnunciXML) error { +func (i *ImageRefManager) InsertImagesRef(annunci *typedefs.AnnunciXML) error { batch := &pgx.Batch{} @@ -48,7 +49,7 @@ func (i *ImageRefManager) InsertImagesRef(annunci *AnnunciXML) error { return nil } -func (i *ImageRefManager) FindIsUpdate(annunci *AnnunciXML) ([]string, error) { +func (i *ImageRefManager) FindIsUpdate(annunci *typedefs.AnnunciXML) ([]string, error) { r, err := i.GetImagesRef() if err != nil { return nil, err diff --git a/apps/backend/storage.go b/apps/backend/storage.go index a43f54b..ee53f78 100644 --- a/apps/backend/storage.go +++ b/apps/backend/storage.go @@ -1,6 +1,7 @@ package main import ( + "backend/typedefs" "errors" "fmt" "log" @@ -85,7 +86,7 @@ func RemoveFromDb(ref string) error { func RemoveExpired() error { //get all expired files - var items_db []Storageindex + var items_db []typedefs.Storageindex err := pgxscan.Select(Db.Ctx, Db.Dbpool, &items_db, "SELECT * FROM public.storageindex WHERE expires_at is not null and expires_at < NOW()") if err != nil { return fmt.Errorf("failed to get expired items: %w", err)