Skip to content
Snippets Groups Projects
Commit 68c7c73e authored by Alex Petraky's avatar Alex Petraky :basketball_player_tone1:
Browse files

Revert "Merge branch 'feature/PRXS-1195-CollsUpdateTTL' into 'master'"

This reverts merge request !42
parent 93c54e98
No related branches found
No related tags found
No related merge requests found
Subproject commit dcb1e741b7515784c6125761d459c23e3b61805f
Subproject commit d9fd1b7382944ef12019bcab1ad00334d9b90a88
......@@ -61,7 +61,6 @@ type Collection struct {
Hidden bool `json:"hidden" bson:"hidden"` // Коллекция скрыта в административном интерфейсе
Schema *schema.Schema `json:"schema" bson:"schema"`
Access *Access `json:"access" bson:"-"` // Ограничения на доступ к элементам коллекции. Отсутствие объекта означает неограниченный доступ
TTL time.Duration `json:"ttl" bson:"ttl"` // Время хранения записи в коллекции
// StateInfo отображает состояние коллекции:
// - State: идентификатор состояния коллекции (new/preparing/ready/error/changed)
......@@ -133,7 +132,6 @@ func (c Collection) Clone() *Collection {
Name: c.Name,
NoData: c.NoData,
Hidden: c.Hidden,
TTL: c.TTL,
}
if c.Single != nil {
......
......@@ -13,7 +13,6 @@ import (
pb "git.perx.ru/perxis/perxis-go/proto/collections"
commonpb "git.perx.ru/perxis/perxis-go/proto/common"
jsoniter "github.com/json-iterator/go"
"google.golang.org/protobuf/types/known/durationpb"
"google.golang.org/protobuf/types/known/timestamppb"
)
......@@ -70,7 +69,6 @@ func PtrCollectionToProto(coll *service.Collection) (*pb.Collection, error) {
Access: access,
Hidden: coll.Hidden,
Tags: coll.Tags,
Ttl: durationpb.New(coll.TTL),
}
if coll.StateInfo != nil {
......@@ -129,7 +127,6 @@ func ProtoToPtrCollection(protoCollection *pb.Collection) (*service.Collection,
Access: access,
Hidden: protoCollection.Hidden,
Tags: protoCollection.Tags,
TTL: protoCollection.Ttl.AsDuration(),
}
if protoCollection.StateInfo != nil {
......
......@@ -21,7 +21,6 @@ import (
itemspb "git.perx.ru/perxis/perxis-go/proto/items"
localespb "git.perx.ru/perxis/perxis-go/proto/locales"
"github.com/golang/protobuf/ptypes"
"google.golang.org/protobuf/types/known/durationpb"
"google.golang.org/protobuf/types/known/structpb"
)
......@@ -128,7 +127,6 @@ func PtrCollectionsCollectionToProto(collection *collections.Collection) (*colle
Name: collection.Name,
Single: collection.Single,
System: collection.System,
Ttl: durationpb.New(collection.TTL),
}
if collection.Schema != nil {
b, err := collection.Schema.MarshalJSON()
......@@ -151,7 +149,6 @@ func ProtoToPtrCollectionsCollection(protoCollection *collectionspb.Collection)
Name: protoCollection.Name,
Single: protoCollection.Single,
System: protoCollection.System,
TTL: protoCollection.Ttl.AsDuration(),
}
if protoCollection.Schema != "" {
sch := schema.New()
......
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment