diff --git a/repositories/license/command_repository.go b/repositories/license/command_repository.go index 65dcd39..2ba6331 100644 --- a/repositories/license/command_repository.go +++ b/repositories/license/command_repository.go @@ -49,7 +49,8 @@ func (r *LicenseCommandRepository) UpdateLicense(id uint , license *models.Licen func (r *LicenseCommandRepository) RemoveLicense(id uint)error{ - if err := r.DB.Where("license_id = ?" , id).Error;err != nil { + var license models.License + if err := r.DB.Where("license_id = ?" , id).Model(&license).Update("is_removed" , true).Error;err != nil { return err } diff --git a/repositories/owner/command_repository.go b/repositories/owner/command_repository.go index fa15869..f1b9351 100644 --- a/repositories/owner/command_repository.go +++ b/repositories/owner/command_repository.go @@ -51,7 +51,8 @@ func (r *OwnerCommandRepository) UpdateOwner(id uint , owner *models.Owner)(*mod func (r *OwnerCommandRepository) RemoveOwner(id uint)error{ - if err := r.DB.Where("owner_id = ?" , id).Error;err != nil { + var owner models.Owner + if err := r.DB.Where("owner_id = ?" , id).Model(&owner).Update("is_removed" , true).Error;err != nil { return err } diff --git a/repositories/plan/command_repository.go b/repositories/plan/command_repository.go index db391a3..f4f454d 100644 --- a/repositories/plan/command_repository.go +++ b/repositories/plan/command_repository.go @@ -26,14 +26,7 @@ func (r *PlanCommandRepository) CreatePlan(plan *models.Plan)error{ return nil } -func (r *PlanCommandRepository) GetPlan(id uint)(*models.Plan , error){ - var Plan models.Plan - if err := r.DB.Where("is_removed = ?" , false).Where("plan_id = ?" , id).First(&Plan).Error; err != nil { - return nil , err - } - return &Plan , nil -} func (r *PlanCommandRepository) UpdatePlan(id uint , plan *models.Plan)(*models.Plan , error){ var temp models.Plan @@ -58,7 +51,8 @@ func (r *PlanCommandRepository) UpdatePlan(id uint , plan *models.Plan)(*models. func (r *PlanCommandRepository) RemovePlan(id uint)error{ - if err := r.DB.Where("plan_id = ?" , id).Error;err != nil { + var plan models.Plan + if err := r.DB.Where("plan_id = ?" , id).Model(&plan).Update("is_removed" , true).Error;err != nil { return err } diff --git a/repositories/store/command_repository.go b/repositories/store/command_repository.go index 081de2b..dbb2dd1 100644 --- a/repositories/store/command_repository.go +++ b/repositories/store/command_repository.go @@ -25,23 +25,7 @@ func (r *StoreCommandRepository) CreateStore(store *models.Store)error{ return nil } -func (r *StoreCommandRepository) GetStore(id uint)(*models.Store , error){ - var store models.Store - if err := r.DB.Where("is_removed = ?" , false).Where("store_id = ?" , id).First(&store).Error; err != nil { - return nil , err - } - return &store , nil -} - -func (r *StoreCommandRepository) GetStores(id uint)([]models.Store , error){ - var store []models.Store - if err := r.DB.Where("is_removed = ?" , false).Where("owner_id = ?" , id).Find(&store).Error; err != nil { - return nil , err - } - - return store , nil -} func (r *StoreCommandRepository) UpdateStore(id uint , store *models.Store)(*models.Store , error){ var temp models.Store @@ -51,6 +35,7 @@ func (r *StoreCommandRepository) UpdateStore(id uint , store *models.Store)(*mod } temp.Address = store.Address + temp.PhoneNumber = store.PhoneNumber temp.AdminPanelAddress = store.AdminPanelAddress temp.ApiAddress = store.ApiAddress temp.Modified_at = store.Modified_at @@ -70,7 +55,8 @@ func (r *StoreCommandRepository) UpdateStore(id uint , store *models.Store)(*mod func (r *StoreCommandRepository) RemoveStore(id uint)error{ - if err := r.DB.Where("store_id = ?" , id).Error;err != nil { + var store models.Store + if err := r.DB.Where("store_id = ?" , id).Model(&store).Update("is_removed" , true).Error;err != nil { return err }