piwigo/PiwigoDirectoryUploader
2
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

WIP: renamed function and made it package internal as it gets orchestrated by another sync function

Browse Source
This commit is contained in:
Philipp Häfelfinger 2019-04-04 15:39:32 +02:00
parent ca2620d426
commit 8c91dd2107
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
internal/pkg/category/category.go
View File

@ -16,7 +16,9 @@ import (
"sort" "sort"
) )
func SynchronizePiwigoCategories(piwigoApi piwigo.PiwigoCategoryApi, db datastore.CategoryProvider) error { func updatePiwigoCategoriesFromServer(piwigoApi piwigo.PiwigoCategoryApi, db datastore.CategoryProvider) error {
logrus.Debug("Entering updatePiwigoCategoriesFromServer")
defer logrus.Debug("Leaving updatePiwigoCategoriesFromServer")
categories, err := piwigoApi.GetAllCategories() categories, err := piwigoApi.GetAllCategories()
if err != nil { if err != nil {
@ -24,7 +26,6 @@ func SynchronizePiwigoCategories(piwigoApi piwigo.PiwigoCategoryApi, db datastor
} }
for _, pwgcat := range categories { for _, pwgcat := range categories {
dbcat, err := db.GetCategoryByPiwigoId(pwgcat.Id) dbcat, err := db.GetCategoryByPiwigoId(pwgcat.Id)
if err == datastore.ErrorRecordNotFound { if err == datastore.ErrorRecordNotFound {
logrus.Debugf("Adding category %s", pwgcat.Key) logrus.Debugf("Adding category %s", pwgcat.Key)

8
internal/pkg/category/category_test.go
View File

@ -15,7 +15,7 @@ import (
//go:generate mockgen -destination=./piwigo_mock_test.go -package=category git.haefelfinger.net/piwigo/PiwigoDirectoryUploader/internal/pkg/piwigo PiwigoApi,PiwigoCategoryApi,PiwigoImageApi //go:generate mockgen -destination=./piwigo_mock_test.go -package=category git.haefelfinger.net/piwigo/PiwigoDirectoryUploader/internal/pkg/piwigo PiwigoApi,PiwigoCategoryApi,PiwigoImageApi
//go:generate mockgen -destination=./datastore_mock_test.go -package=category git.haefelfinger.net/piwigo/PiwigoDirectoryUploader/internal/pkg/datastore CategoryProvider //go:generate mockgen -destination=./datastore_mock_test.go -package=category git.haefelfinger.net/piwigo/PiwigoDirectoryUploader/internal/pkg/datastore CategoryProvider
func Test_SynchronizePiwigoCategories_adds_new_categories(t *testing.T) { func Test_updatePiwigoCategoriesFromServer_adds_new_categories(t *testing.T) {
mockCtrl := gomock.NewController(t) mockCtrl := gomock.NewController(t)
defer mockCtrl.Finish() defer mockCtrl.Finish()
@ -31,13 +31,13 @@ func Test_SynchronizePiwigoCategories_adds_new_categories(t *testing.T) {
piwigoMock := NewMockPiwigoCategoryApi(mockCtrl) piwigoMock := NewMockPiwigoCategoryApi(mockCtrl)
piwigoMock.EXPECT().GetAllCategories().Return(piwigoCategories, nil).Times(1) piwigoMock.EXPECT().GetAllCategories().Return(piwigoCategories, nil).Times(1)
err := SynchronizePiwigoCategories(piwigoMock, dbmock) err := updatePiwigoCategoriesFromServer(piwigoMock, dbmock)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
} }
func Test_SynchronizePiwigoCategories_updates_a_category(t *testing.T) { func Test_updatePiwigoCategoriesFromServer_updates_a_category(t *testing.T) {
mockCtrl := gomock.NewController(t) mockCtrl := gomock.NewController(t)
defer mockCtrl.Finish() defer mockCtrl.Finish()
@ -68,7 +68,7 @@ func Test_SynchronizePiwigoCategories_updates_a_category(t *testing.T) {
piwigoMock := NewMockPiwigoCategoryApi(mockCtrl) piwigoMock := NewMockPiwigoCategoryApi(mockCtrl)
piwigoMock.EXPECT().GetAllCategories().Return(piwigoCategories, nil).Times(1) piwigoMock.EXPECT().GetAllCategories().Return(piwigoCategories, nil).Times(1)
err := SynchronizePiwigoCategories(piwigoMock, dbmock) err := updatePiwigoCategoriesFromServer(piwigoMock, dbmock)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }