No versions found
{{- end }} diff --git a/repositories/metadata/metadata.go b/repositories/metadata/metadata.go index f3260dc..22d81c6 100644 --- a/repositories/metadata/metadata.go +++ b/repositories/metadata/metadata.go @@ -5,7 +5,8 @@ import ( "github.com/pkg/errors" - "github.com/teran/archived/exporter/models" + emodels "github.com/teran/archived/exporter/models" + "github.com/teran/archived/models" ) var ErrNotFound = errors.New("not found") @@ -17,10 +18,10 @@ type Repository interface { CreateVersion(ctx context.Context, container string) (string, error) GetLatestPublishedVersionByContainer(ctx context.Context, container string) (string, error) - ListAllVersionsByContainer(ctx context.Context, container string) ([]string, error) - ListPublishedVersionsByContainer(ctx context.Context, container string) ([]string, error) - ListPublishedVersionsByContainerAndPage(ctx context.Context, container string, offset, limit uint64) (uint64, []string, error) - ListUnpublishedVersionsByContainer(ctx context.Context, container string) ([]string, error) + ListAllVersionsByContainer(ctx context.Context, container string) ([]models.Version, error) + ListPublishedVersionsByContainer(ctx context.Context, container string) ([]models.Version, error) + ListPublishedVersionsByContainerAndPage(ctx context.Context, container string, offset, limit uint64) (uint64, []models.Version, error) + ListUnpublishedVersionsByContainer(ctx context.Context, container string) ([]models.Version, error) MarkVersionPublished(ctx context.Context, container, version string) error DeleteVersion(ctx context.Context, container, version string) error @@ -33,5 +34,5 @@ type Repository interface { GetBlobKeyByObject(ctx context.Context, container, version, key string) (string, error) EnsureBlobKey(ctx context.Context, key string, size uint64) error - CountStats(ctx context.Context) (*models.Stats, error) + CountStats(ctx context.Context) (*emodels.Stats, error) } diff --git a/repositories/metadata/mock/mock.go b/repositories/metadata/mock/mock.go index 479dc57..5445db7 100644 --- a/repositories/metadata/mock/mock.go +++ b/repositories/metadata/mock/mock.go @@ -4,7 +4,8 @@ import ( "context" "github.com/stretchr/testify/mock" - "github.com/teran/archived/exporter/models" + emodels "github.com/teran/archived/exporter/models" + "github.com/teran/archived/models" "github.com/teran/archived/repositories/metadata" ) @@ -43,24 +44,24 @@ func (m *Mock) GetLatestPublishedVersionByContainer(_ context.Context, container return args.String(0), args.Error(1) } -func (m *Mock) ListAllVersionsByContainer(_ context.Context, container string) ([]string, error) { +func (m *Mock) ListAllVersionsByContainer(_ context.Context, container string) ([]models.Version, error) { args := m.Called(container) - return args.Get(0).([]string), args.Error(1) + return args.Get(0).([]models.Version), args.Error(1) } -func (m *Mock) ListPublishedVersionsByContainer(_ context.Context, container string) ([]string, error) { +func (m *Mock) ListPublishedVersionsByContainer(_ context.Context, container string) ([]models.Version, error) { args := m.Called(container) - return args.Get(0).([]string), args.Error(1) + return args.Get(0).([]models.Version), args.Error(1) } -func (m *Mock) ListPublishedVersionsByContainerAndPage(_ context.Context, container string, offset, limit uint64) (uint64, []string, error) { +func (m *Mock) ListPublishedVersionsByContainerAndPage(_ context.Context, container string, offset, limit uint64) (uint64, []models.Version, error) { args := m.Called(container, offset, limit) - return args.Get(0).(uint64), args.Get(1).([]string), args.Error(2) + return args.Get(0).(uint64), args.Get(1).([]models.Version), args.Error(2) } -func (m *Mock) ListUnpublishedVersionsByContainer(_ context.Context, container string) ([]string, error) { +func (m *Mock) ListUnpublishedVersionsByContainer(_ context.Context, container string) ([]models.Version, error) { args := m.Called(container) - return args.Get(0).([]string), args.Error(1) + return args.Get(0).([]models.Version), args.Error(1) } func (m *Mock) MarkVersionPublished(_ context.Context, container, version string) error { @@ -108,7 +109,7 @@ func (m *Mock) EnsureBlobKey(_ context.Context, key string, size uint64) error { return args.Error(0) } -func (m *Mock) CountStats(ctx context.Context) (*models.Stats, error) { +func (m *Mock) CountStats(ctx context.Context) (*emodels.Stats, error) { args := m.Called() - return args.Get(0).(*models.Stats), args.Error(1) + return args.Get(0).(*emodels.Stats), args.Error(1) } diff --git a/repositories/metadata/postgresql/versions.go b/repositories/metadata/postgresql/versions.go index 91d04e3..44a000d 100644 --- a/repositories/metadata/postgresql/versions.go +++ b/repositories/metadata/postgresql/versions.go @@ -2,10 +2,13 @@ package postgresql import ( "context" + "time" sq "github.com/Masterminds/squirrel" "github.com/pkg/errors" ptr "github.com/teran/go-ptr" + + "github.com/teran/archived/models" ) const defaultLimit uint64 = 1000 @@ -81,26 +84,26 @@ func (r *repository) GetLatestPublishedVersionByContainer(ctx context.Context, c return versionName, nil } -func (r *repository) ListPublishedVersionsByContainer(ctx context.Context, container string) ([]string, error) { +func (r *repository) ListPublishedVersionsByContainer(ctx context.Context, container string) ([]models.Version, error) { _, versions, err := r.listVersionsByContainer(ctx, container, ptr.Bool(true), 0, 0) return versions, err } -func (r *repository) ListAllVersionsByContainer(ctx context.Context, container string) ([]string, error) { +func (r *repository) ListAllVersionsByContainer(ctx context.Context, container string) ([]models.Version, error) { _, versions, err := r.listVersionsByContainer(ctx, container, nil, 0, 0) return versions, err } -func (r *repository) ListUnpublishedVersionsByContainer(ctx context.Context, container string) ([]string, error) { +func (r *repository) ListUnpublishedVersionsByContainer(ctx context.Context, container string) ([]models.Version, error) { _, versions, err := r.listVersionsByContainer(ctx, container, ptr.Bool(false), 0, 0) return versions, err } -func (r *repository) ListPublishedVersionsByContainerAndPage(ctx context.Context, container string, offset, limit uint64) (uint64, []string, error) { +func (r *repository) ListPublishedVersionsByContainerAndPage(ctx context.Context, container string, offset, limit uint64) (uint64, []models.Version, error) { return r.listVersionsByContainer(ctx, container, ptr.Bool(true), offset, limit) } -func (r *repository) listVersionsByContainer(ctx context.Context, container string, isPublished *bool, offset, limit uint64) (uint64, []string, error) { +func (r *repository) listVersionsByContainer(ctx context.Context, container string, isPublished *bool, offset, limit uint64) (uint64, []models.Version, error) { if limit == 0 { limit = defaultLimit } @@ -140,7 +143,7 @@ func (r *repository) listVersionsByContainer(ctx context.Context, container stri } rows, err := selectQuery(ctx, r.db, psql. - Select("name"). + Select("name", "is_published", "created_at"). From("versions"). Where(condition). OrderBy("created_at DESC"). @@ -151,12 +154,21 @@ func (r *repository) listVersionsByContainer(ctx context.Context, container stri } defer rows.Close() - result := []string{} + result := []models.Version{} for rows.Next() { - var r string - if err := rows.Scan(&r); err != nil { + var ( + r models.Version + createdAt time.Time + ) + + if err := rows.Scan(&r.Name, &r.IsPublished, &createdAt); err != nil { return 0, nil, errors.Wrap(err, "error decoding database result") } + r.CreatedAt = time.Date( + createdAt.Year(), createdAt.Month(), createdAt.Day(), + createdAt.Hour(), createdAt.Minute(), createdAt.Second(), createdAt.Nanosecond(), + time.UTC, + ) result = append(result, r) } diff --git a/repositories/metadata/postgresql/versions_test.go b/repositories/metadata/postgresql/versions_test.go index 186a635..a94557e 100644 --- a/repositories/metadata/postgresql/versions_test.go +++ b/repositories/metadata/postgresql/versions_test.go @@ -1,6 +1,11 @@ package postgresql -import "github.com/teran/archived/repositories/metadata" +import ( + "time" + + "github.com/teran/archived/models" + "github.com/teran/archived/repositories/metadata" +) func (s *postgreSQLRepositoryTestSuite) TestVersionsOperations() { s.tp.On("Now").Return("2024-07-07T10:11:12Z").Times(4) @@ -22,11 +27,21 @@ func (s *postgreSQLRepositoryTestSuite) TestVersionsOperations() { listC1, err := s.repo.ListAllVersionsByContainer(s.ctx, "container1") s.Require().NoError(err) - s.Require().Equal([]string{"20240707101112"}, listC1) + s.Require().Equal([]models.Version{ + { + Name: "20240707101112", + CreatedAt: time.Date(2024, 7, 7, 10, 11, 12, 0, time.UTC), + }, + }, listC1) listC2, err := s.repo.ListAllVersionsByContainer(s.ctx, "container2") s.Require().NoError(err) - s.Require().Equal([]string{"20240707111213"}, listC2) + s.Require().Equal([]models.Version{ + { + Name: "20240707111213", + CreatedAt: time.Date(2024, 7, 7, 11, 12, 13, 0, time.UTC), + }, + }, listC2) } func (s *postgreSQLRepositoryTestSuite) TestPublishVersion() { @@ -40,22 +55,39 @@ func (s *postgreSQLRepositoryTestSuite) TestPublishVersion() { list, err := s.repo.ListAllVersionsByContainer(s.ctx, "container1") s.Require().NoError(err) - s.Require().Equal([]string{"20240707101112"}, list) + s.Require().Equal([]models.Version{ + { + Name: "20240707101112", + CreatedAt: time.Date(2024, 7, 7, 10, 11, 12, 0, time.UTC), + }, + }, list) list, err = s.repo.ListPublishedVersionsByContainer(s.ctx, "container1") s.Require().NoError(err) - s.Require().Equal([]string{}, list) + s.Require().Equal([]models.Version{}, list) err = s.repo.MarkVersionPublished(s.ctx, "container1", version) s.Require().NoError(err) list, err = s.repo.ListAllVersionsByContainer(s.ctx, "container1") s.Require().NoError(err) - s.Require().Equal([]string{"20240707101112"}, list) + s.Require().Equal([]models.Version{ + { + Name: "20240707101112", + IsPublished: true, + CreatedAt: time.Date(2024, 7, 7, 10, 11, 12, 0, time.UTC), + }, + }, list) list, err = s.repo.ListPublishedVersionsByContainer(s.ctx, "container1") s.Require().NoError(err) - s.Require().Equal([]string{"20240707101112"}, list) + s.Require().Equal([]models.Version{ + { + Name: "20240707101112", + IsPublished: true, + CreatedAt: time.Date(2024, 7, 7, 10, 11, 12, 0, time.UTC), + }, + }, list) } func (s *postgreSQLRepositoryTestSuite) TestListAllVersionsByContainerErrors() { @@ -107,12 +139,29 @@ func (s *postgreSQLRepositoryTestSuite) TestVersionsPagination() { total, listByPage, err := s.repo.ListPublishedVersionsByContainerAndPage(s.ctx, "container1", 0, 5) s.Require().NoError(err) s.Require().Equal(uint64(2), total) - s.Require().Equal([]string{version3, version1}, listByPage) + s.Require().Equal([]models.Version{ + { + Name: version3, + IsPublished: true, + CreatedAt: time.Date(2024, 7, 7, 10, 11, 14, 0, time.UTC), + }, + { + Name: version1, + IsPublished: true, + CreatedAt: time.Date(2024, 7, 7, 10, 11, 12, 0, time.UTC), + }, + }, listByPage) total, listByPage, err = s.repo.ListPublishedVersionsByContainerAndPage(s.ctx, "container1", 1, 2) s.Require().NoError(err) s.Require().Equal(uint64(2), total) - s.Require().Equal([]string{version1}, listByPage) + s.Require().Equal([]models.Version{ + { + Name: version1, + IsPublished: true, + CreatedAt: time.Date(2024, 7, 7, 10, 11, 12, 0, time.UTC), + }, + }, listByPage) } func (s *postgreSQLRepositoryTestSuite) TestDeleteVersion() { @@ -141,22 +190,54 @@ func (s *postgreSQLRepositoryTestSuite) TestDeleteVersion() { versions1, err := s.repo.ListAllVersionsByContainer(s.ctx, "container1") s.Require().NoError(err) - s.Require().Equal([]string{version2, version1}, versions1) + s.Require().Equal([]models.Version{ + { + Name: version2, + CreatedAt: time.Date(2024, 7, 7, 10, 11, 13, 0, time.UTC), + }, + { + Name: version1, + CreatedAt: time.Date(2024, 7, 7, 10, 11, 12, 0, time.UTC), + }, + }, versions1) versions2, err := s.repo.ListAllVersionsByContainer(s.ctx, "container2") s.Require().NoError(err) - s.Require().Equal([]string{version4, version3}, versions2) + s.Require().Equal([]models.Version{ + { + Name: version4, + CreatedAt: time.Date(2024, 7, 7, 10, 11, 15, 0, time.UTC), + }, + { + Name: version3, + CreatedAt: time.Date(2024, 7, 7, 10, 11, 14, 0, time.UTC), + }, + }, versions2) err = s.repo.DeleteVersion(s.ctx, "container1", version1) s.Require().NoError(err) versions1, err = s.repo.ListAllVersionsByContainer(s.ctx, "container1") s.Require().NoError(err) - s.Require().Equal([]string{version2}, versions1) + s.Require().Equal([]models.Version{ + { + Name: version2, + CreatedAt: time.Date(2024, 7, 7, 10, 11, 13, 0, time.UTC), + }, + }, versions1) versions2, err = s.repo.ListAllVersionsByContainer(s.ctx, "container2") s.Require().NoError(err) - s.Require().Equal([]string{version4, version3}, versions2) + s.Require().Equal([]models.Version{ + { + Name: version4, + CreatedAt: time.Date(2024, 7, 7, 10, 11, 15, 0, time.UTC), + }, + { + Name: version3, + CreatedAt: time.Date(2024, 7, 7, 10, 11, 14, 0, time.UTC), + }, + }, versions2) } func (s *postgreSQLRepositoryTestSuite) TestGetLatestPublishedVersionByContainer() { diff --git a/service/mock.go b/service/mock.go index c80ff16..6ece97d 100644 --- a/service/mock.go +++ b/service/mock.go @@ -4,6 +4,7 @@ import ( "context" "github.com/stretchr/testify/mock" + "github.com/teran/archived/models" ) var ( @@ -39,19 +40,19 @@ func (m *Mock) CreateVersion(_ context.Context, container string) (id string, er return args.String(0), args.Error(1) } -func (m *Mock) ListAllVersions(_ context.Context, container string) ([]string, error) { +func (m *Mock) ListAllVersions(_ context.Context, container string) ([]models.Version, error) { args := m.Called(container) - return args.Get(0).([]string), args.Error(1) + return args.Get(0).([]models.Version), args.Error(1) } -func (m *Mock) ListPublishedVersions(_ context.Context, container string) ([]string, error) { +func (m *Mock) ListPublishedVersions(_ context.Context, container string) ([]models.Version, error) { args := m.Called(container) - return args.Get(0).([]string), args.Error(1) + return args.Get(0).([]models.Version), args.Error(1) } -func (m *Mock) ListPublishedVersionsByPage(_ context.Context, container string, pageNum uint64) (uint64, []string, error) { +func (m *Mock) ListPublishedVersionsByPage(_ context.Context, container string, pageNum uint64) (uint64, []models.Version, error) { args := m.Called(container, pageNum) - return args.Get(0).(uint64), args.Get(1).([]string), args.Error(2) + return args.Get(0).(uint64), args.Get(1).([]models.Version), args.Error(2) } func (m *Mock) PublishVersion(_ context.Context, container, id string) error { diff --git a/service/service.go b/service/service.go index 3701983..94fad78 100644 --- a/service/service.go +++ b/service/service.go @@ -5,6 +5,7 @@ import ( "github.com/pkg/errors" + "github.com/teran/archived/models" "github.com/teran/archived/repositories/blob" "github.com/teran/archived/repositories/metadata" ) @@ -18,7 +19,7 @@ type Manager interface { DeleteContainer(ctx context.Context, name string) error CreateVersion(ctx context.Context, container string) (id string, err error) - ListAllVersions(ctx context.Context, container string) ([]string, error) + ListAllVersions(ctx context.Context, container string) ([]models.Version, error) PublishVersion(ctx context.Context, container, id string) error DeleteVersion(ctx context.Context, container, id string) error @@ -32,8 +33,8 @@ type Manager interface { type Publisher interface { ListContainers(ctx context.Context) ([]string, error) - ListPublishedVersions(ctx context.Context, container string) ([]string, error) - ListPublishedVersionsByPage(ctx context.Context, container string, pageNum uint64) (uint64, []string, error) + ListPublishedVersions(ctx context.Context, container string) ([]models.Version, error) + ListPublishedVersionsByPage(ctx context.Context, container string, pageNum uint64) (uint64, []models.Version, error) ListObjectsByPage(ctx context.Context, container, versionID string, pageNum uint64) (uint64, []string, error) GetObjectURL(ctx context.Context, container, versionID, key string) (string, error) @@ -86,12 +87,12 @@ func (s *service) CreateVersion(ctx context.Context, container string) (id strin return version, mapMetadataErrors(err) } -func (s *service) ListPublishedVersions(ctx context.Context, container string) ([]string, error) { +func (s *service) ListPublishedVersions(ctx context.Context, container string) ([]models.Version, error) { versions, err := s.mdRepo.ListPublishedVersionsByContainer(ctx, container) return versions, mapMetadataErrors(err) } -func (s *service) ListPublishedVersionsByPage(ctx context.Context, container string, pageNum uint64) (uint64, []string, error) { +func (s *service) ListPublishedVersionsByPage(ctx context.Context, container string, pageNum uint64) (uint64, []models.Version, error) { if pageNum < 1 { pageNum = 1 } @@ -111,7 +112,7 @@ func (s *service) ListPublishedVersionsByPage(ctx context.Context, container str return totalPages, versions, mapMetadataErrors(err) } -func (s *service) ListAllVersions(ctx context.Context, container string) ([]string, error) { +func (s *service) ListAllVersions(ctx context.Context, container string) ([]models.Version, error) { versions, err := s.mdRepo.ListAllVersionsByContainer(ctx, container) return versions, mapMetadataErrors(err) } diff --git a/service/service_test.go b/service/service_test.go index a894f8d..70d9476 100644 --- a/service/service_test.go +++ b/service/service_test.go @@ -7,6 +7,7 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/suite" + "github.com/teran/archived/models" blobRepoMock "github.com/teran/archived/repositories/blob/mock" "github.com/teran/archived/repositories/metadata" mdRepoMock "github.com/teran/archived/repositories/metadata/mock" @@ -89,28 +90,32 @@ func (s *serviceTestSuite) TestListContainers() { } func (s *serviceTestSuite) TestListPublishedVersions() { - s.mdRepoMock.On("ListPublishedVersionsByContainer", "container").Return([]string{ - "version1", "version2", + s.mdRepoMock.On("ListPublishedVersionsByContainer", "container").Return([]models.Version{ + {Name: "version1"}, + {Name: "version2"}, }, nil).Once() versions, err := s.svc.ListPublishedVersions(s.ctx, "container") s.Require().NoError(err) - s.Require().Equal([]string{ - "version1", "version2", + s.Require().Equal([]models.Version{ + {Name: "version1"}, + {Name: "version2"}, }, versions) } func (s *serviceTestSuite) TestListPublishedVersionsByPage() { s.mdRepoMock. On("ListPublishedVersionsByContainerAndPage", "container", uint64(450), uint64(50)). - Return(uint64(1000), []string{ - "version1", "version2", + Return(uint64(1000), []models.Version{ + {Name: "version1"}, + {Name: "version2"}, }, nil).Once() total, versions, err := s.svc.ListPublishedVersionsByPage(s.ctx, "container", 10) s.Require().NoError(err) - s.Require().Equal([]string{ - "version1", "version2", + s.Require().Equal([]models.Version{ + {Name: "version1"}, + {Name: "version2"}, }, versions) s.Require().Equal(uint64(20), total) }