basic orders are ready

This commit is contained in:
Daniel Goc
2026-04-10 14:53:40 +02:00
parent a03a2b461f
commit 33e9d016e9
15 changed files with 237 additions and 94 deletions

View File

@@ -21,7 +21,7 @@ func New() *AddressesService {
}
}
func (s *AddressesService) GetTemplate(country_id uint) (model.AddressField, error) {
func (s *AddressesService) GetTemplate(country_id uint) (model.AddressUnparsed, error) {
switch country_id {
case 1: // Poland
@@ -74,30 +74,23 @@ func (s *AddressesService) ModifyAddress(user_id uint, address_id uint, address_
return s.repo.UpdateAddress(user_id, address_id, address_info, country_id)
}
func (s *AddressesService) RetrieveAddressesInfo(user_id uint) (*[]model.AddressUnparsed, error) {
parsed_addresses, err := s.repo.RetrieveAddresses(user_id)
func (s *AddressesService) RetrieveAddresses(user_id uint) (*[]model.Address, error) {
addresses, err := s.repo.RetrieveAddresses(user_id)
if err != nil {
return nil, err
}
var unparsed_addresses []model.AddressUnparsed
for i := 0; i < len(*parsed_addresses); i++ {
var next_address model.AddressUnparsed
next_address.ID = (*parsed_addresses)[i].ID
next_address.CustomerID = (*parsed_addresses)[i].CustomerID
next_address.CountryID = (*parsed_addresses)[i].CountryID
next_address.AddressInfo, err = s.ValidateAddressJson((*parsed_addresses)[i].AddressInfo, next_address.CountryID)
for i := 0; i < len(*addresses); i++ {
address_unparsed, err := s.ValidateAddressJson((*addresses)[i].AddressString, (*addresses)[i].CountryID)
// log such errors
if err != nil {
fmt.Printf("err: %v\n", err)
}
unparsed_addresses = append(unparsed_addresses, next_address)
(*addresses)[i].AddressUnparsed = &address_unparsed
}
return &unparsed_addresses, nil
return addresses, nil
}
func (s *AddressesService) DeleteAddress(user_id uint, address_id uint) error {
@@ -112,7 +105,7 @@ func (s *AddressesService) DeleteAddress(user_id uint, address_id uint) error {
}
// validateAddressJson makes sure that the info string represents a valid json of address in given country
func (s *AddressesService) ValidateAddressJson(info string, country_id uint) (model.AddressField, error) {
func (s *AddressesService) ValidateAddressJson(info string, country_id uint) (model.AddressUnparsed, error) {
dec := json.NewDecoder(strings.NewReader(info))
dec.DisallowUnknownFields()