diff --git a/client/react-native/common/graphql/fragments/Contact.js b/client/react-native/common/graphql/fragments/Contact.js index 940d0ace32..01bf91cfed 100644 --- a/client/react-native/common/graphql/fragments/Contact.js +++ b/client/react-native/common/graphql/fragments/Contact.js @@ -8,14 +8,12 @@ export default component => id createdAt updatedAt - deletedAt sigchain status devices { id createdAt updatedAt - deletedAt name status apiVersion diff --git a/client/react-native/common/graphql/fragments/Conversation.js b/client/react-native/common/graphql/fragments/Conversation.js index 97db57698e..a063ed6cf9 100644 --- a/client/react-native/common/graphql/fragments/Conversation.js +++ b/client/react-native/common/graphql/fragments/Conversation.js @@ -8,27 +8,23 @@ export default component => id createdAt updatedAt - deletedAt title topic members { id createdAt updatedAt - deletedAt status contact { id createdAt updatedAt - deletedAt sigchain status devices { id createdAt updatedAt - deletedAt name status apiVersion diff --git a/client/react-native/common/graphql/fragments/Event.js b/client/react-native/common/graphql/fragments/Event.js index 7837cbb4af..95462c3d96 100644 --- a/client/react-native/common/graphql/fragments/Event.js +++ b/client/react-native/common/graphql/fragments/Event.js @@ -9,7 +9,6 @@ export default component => senderId createdAt updatedAt - deletedAt sentAt receivedAt ackedAt diff --git a/client/react-native/common/graphql/mutations/ContactAcceptRequest.js b/client/react-native/common/graphql/mutations/ContactAcceptRequest.js index cf863d6cd2..dc388a1873 100644 --- a/client/react-native/common/graphql/mutations/ContactAcceptRequest.js +++ b/client/react-native/common/graphql/mutations/ContactAcceptRequest.js @@ -22,14 +22,12 @@ const ContactAcceptRequestMutation = graphql` id createdAt updatedAt - deletedAt sigchain status devices { id createdAt updatedAt - deletedAt name status apiVersion diff --git a/client/react-native/common/graphql/mutations/ContactRemove.js b/client/react-native/common/graphql/mutations/ContactRemove.js index 9a04097d45..dcc63dc4a1 100644 --- a/client/react-native/common/graphql/mutations/ContactRemove.js +++ b/client/react-native/common/graphql/mutations/ContactRemove.js @@ -21,14 +21,12 @@ const ContactRemoveMutation = graphql` id createdAt updatedAt - deletedAt sigchain status devices { id createdAt updatedAt - deletedAt name status apiVersion diff --git a/client/react-native/common/graphql/mutations/ContactRequest.js b/client/react-native/common/graphql/mutations/ContactRequest.js index 2c7e5e8d76..8fe968d073 100644 --- a/client/react-native/common/graphql/mutations/ContactRequest.js +++ b/client/react-native/common/graphql/mutations/ContactRequest.js @@ -12,14 +12,12 @@ const ContactRequestMutation = graphql` id createdAt updatedAt - deletedAt sigchain status devices { id createdAt updatedAt - deletedAt name status apiVersion diff --git a/client/react-native/common/graphql/mutations/ConversationAddMessage.js b/client/react-native/common/graphql/mutations/ConversationAddMessage.js index 4da80e0584..787ee08c35 100644 --- a/client/react-native/common/graphql/mutations/ConversationAddMessage.js +++ b/client/react-native/common/graphql/mutations/ConversationAddMessage.js @@ -15,7 +15,6 @@ const ConversationAddMessageMutation = graphql` senderId createdAt updatedAt - deletedAt sentAt receivedAt ackedAt diff --git a/client/react-native/common/graphql/mutations/ConversationCreate.js b/client/react-native/common/graphql/mutations/ConversationCreate.js index 8044d39107..e0714d4691 100644 --- a/client/react-native/common/graphql/mutations/ConversationCreate.js +++ b/client/react-native/common/graphql/mutations/ConversationCreate.js @@ -13,27 +13,23 @@ const ConversationCreateMutation = graphql` id createdAt updatedAt - deletedAt title topic members { id createdAt updatedAt - deletedAt status contact { id createdAt updatedAt - deletedAt sigchain status devices { id createdAt updatedAt - deletedAt name status apiVersion diff --git a/client/react-native/common/graphql/mutations/ConversationInvite.js b/client/react-native/common/graphql/mutations/ConversationInvite.js index 567bf826bd..860427af02 100644 --- a/client/react-native/common/graphql/mutations/ConversationInvite.js +++ b/client/react-native/common/graphql/mutations/ConversationInvite.js @@ -12,27 +12,23 @@ const ConversationInviteMutation = graphql` id createdAt updatedAt - deletedAt title topic members { id createdAt updatedAt - deletedAt status contact { id createdAt updatedAt - deletedAt sigchain status devices { id createdAt updatedAt - deletedAt name status apiVersion diff --git a/client/react-native/common/graphql/mutations/DebugRequeueEvent.js b/client/react-native/common/graphql/mutations/DebugRequeueEvent.js index 34d1a05460..ef4a697aaf 100644 --- a/client/react-native/common/graphql/mutations/DebugRequeueEvent.js +++ b/client/react-native/common/graphql/mutations/DebugRequeueEvent.js @@ -9,7 +9,6 @@ const DebugRequeueEventMutation = graphql` senderId createdAt updatedAt - deletedAt sentAt receivedAt ackedAt diff --git a/client/react-native/common/graphql/subscriptions/EventStream.js b/client/react-native/common/graphql/subscriptions/EventStream.js index ffad21337e..613ff76923 100644 --- a/client/react-native/common/graphql/subscriptions/EventStream.js +++ b/client/react-native/common/graphql/subscriptions/EventStream.js @@ -8,7 +8,6 @@ const EventStream = graphql` senderId createdAt updatedAt - deletedAt sentAt receivedAt ackedAt diff --git a/client/react-native/common/schema.graphql b/client/react-native/common/schema.graphql index cbec7acf5b..460fb8a422 100644 --- a/client/react-native/common/schema.graphql +++ b/client/react-native/common/schema.graphql @@ -255,7 +255,6 @@ type BertyEntityDevice implements Node { id: ID! createdAt: GoogleProtobufTimestamp updatedAt: GoogleProtobufTimestamp - deletedAt: GoogleProtobufTimestamp name: String! status: Enum apiVersion: Uint32! @@ -270,7 +269,6 @@ type BertyEntityContact implements Node { id: ID! createdAt: GoogleProtobufTimestamp updatedAt: GoogleProtobufTimestamp - deletedAt: GoogleProtobufTimestamp sigchain: [Byte!], status: Enum devices: [BertyEntityDevice] @@ -287,7 +285,6 @@ type BertyEntityConversation implements Node { id: ID! createdAt: GoogleProtobufTimestamp updatedAt: GoogleProtobufTimestamp - deletedAt: GoogleProtobufTimestamp title: String! topic: String! members: [BertyEntityConversationMember] @@ -297,7 +294,6 @@ type BertyEntityConversationMember implements Node { id: ID! createdAt: GoogleProtobufTimestamp updatedAt: GoogleProtobufTimestamp - deletedAt: GoogleProtobufTimestamp status: Enum contact: BertyEntityContact conversationId: String! @@ -319,7 +315,6 @@ type BertyEntitySenderAlias { id: String! createdAt: GoogleProtobufTimestamp updatedAt: GoogleProtobufTimestamp - deletedAt: GoogleProtobufTimestamp status: Enum originDeviceId: String! contactId: String! @@ -382,7 +377,6 @@ type BertyP2pEvent implements Node { senderId: String! createdAt: GoogleProtobufTimestamp updatedAt: GoogleProtobufTimestamp - deletedAt: GoogleProtobufTimestamp sentAt: GoogleProtobufTimestamp receivedAt: GoogleProtobufTimestamp ackedAt: GoogleProtobufTimestamp @@ -498,7 +492,6 @@ input BertyP2pEventInput { senderId: String! createdAt: GoogleProtobufTimestampInput updatedAt: GoogleProtobufTimestampInput - deletedAt: GoogleProtobufTimestampInput sentAt: GoogleProtobufTimestampInput receivedAt: GoogleProtobufTimestampInput ackedAt: GoogleProtobufTimestampInput @@ -515,7 +508,6 @@ type BertyP2pEventPayload { senderId: String! createdAt: GoogleProtobufTimestamp updatedAt: GoogleProtobufTimestamp - deletedAt: GoogleProtobufTimestamp sentAt: GoogleProtobufTimestamp receivedAt: GoogleProtobufTimestamp ackedAt: GoogleProtobufTimestamp @@ -539,7 +531,6 @@ input BertyEntityDeviceInput { id: ID! createdAt: GoogleProtobufTimestampInput updatedAt: GoogleProtobufTimestampInput - deletedAt: GoogleProtobufTimestampInput name: String! status: Enum apiVersion: Uint32! @@ -549,7 +540,6 @@ input BertyEntityContactInput { id: ID! createdAt: GoogleProtobufTimestampInput updatedAt: GoogleProtobufTimestampInput - deletedAt: GoogleProtobufTimestampInput sigchain: [Byte!], status: Enum devices: [BertyEntityDeviceInput] @@ -562,7 +552,6 @@ type BertyEntityContactPayload { id: ID! createdAt: GoogleProtobufTimestamp updatedAt: GoogleProtobufTimestamp - deletedAt: GoogleProtobufTimestamp sigchain: [Byte!], status: Enum devices: [BertyEntityDevice] @@ -575,7 +564,6 @@ type BertyEntityConversationPayload { id: ID! createdAt: GoogleProtobufTimestamp updatedAt: GoogleProtobufTimestamp - deletedAt: GoogleProtobufTimestamp title: String! topic: String! members: [BertyEntityConversationMember] @@ -584,7 +572,6 @@ input BertyEntityConversationMemberInput { id: ID! createdAt: GoogleProtobufTimestampInput updatedAt: GoogleProtobufTimestampInput - deletedAt: GoogleProtobufTimestampInput status: Enum contact: BertyEntityContactInput conversationId: String! @@ -594,7 +581,6 @@ input BertyEntityConversationInput { id: ID! createdAt: GoogleProtobufTimestampInput updatedAt: GoogleProtobufTimestampInput - deletedAt: GoogleProtobufTimestampInput title: String! topic: String! members: [BertyEntityConversationMemberInput] @@ -606,7 +592,6 @@ type BertyEntityConversationMemberPayload { id: ID! createdAt: GoogleProtobufTimestamp updatedAt: GoogleProtobufTimestamp - deletedAt: GoogleProtobufTimestamp status: Enum contact: BertyEntityContact conversationId: String! @@ -666,7 +651,6 @@ type Query { senderId: String! createdAt: GoogleProtobufTimestampInput updatedAt: GoogleProtobufTimestampInput - deletedAt: GoogleProtobufTimestampInput sentAt: GoogleProtobufTimestampInput receivedAt: GoogleProtobufTimestampInput ackedAt: GoogleProtobufTimestampInput @@ -691,7 +675,6 @@ type Query { id: ID! createdAt: GoogleProtobufTimestampInput updatedAt: GoogleProtobufTimestampInput - deletedAt: GoogleProtobufTimestampInput sigchain: [Byte!], status: Enum devices: [BertyEntityDeviceInput] @@ -713,7 +696,6 @@ type Query { id: ID! createdAt: GoogleProtobufTimestampInput updatedAt: GoogleProtobufTimestampInput - deletedAt: GoogleProtobufTimestampInput title: String! topic: String! members: [BertyEntityConversationMemberInput] @@ -722,7 +704,6 @@ type Query { id: ID! createdAt: GoogleProtobufTimestampInput updatedAt: GoogleProtobufTimestampInput - deletedAt: GoogleProtobufTimestampInput status: Enum contact: BertyEntityContactInput conversationId: String! @@ -756,7 +737,6 @@ type Mutation { id: ID! createdAt: GoogleProtobufTimestampInput updatedAt: GoogleProtobufTimestampInput - deletedAt: GoogleProtobufTimestampInput sigchain: [Byte!], status: Enum devices: [BertyEntityDeviceInput] @@ -769,7 +749,6 @@ type Mutation { id: ID! createdAt: GoogleProtobufTimestampInput updatedAt: GoogleProtobufTimestampInput - deletedAt: GoogleProtobufTimestampInput sigchain: [Byte!], status: Enum devices: [BertyEntityDeviceInput] @@ -782,7 +761,6 @@ type Mutation { id: ID! createdAt: GoogleProtobufTimestampInput updatedAt: GoogleProtobufTimestampInput - deletedAt: GoogleProtobufTimestampInput sigchain: [Byte!], status: Enum devices: [BertyEntityDeviceInput] diff --git a/core/api/node/graphql/gqlgen.gen.yml b/core/api/node/graphql/gqlgen.gen.yml index 39aeb1e7fc..e9036e6b64 100644 --- a/core/api/node/graphql/gqlgen.gen.yml +++ b/core/api/node/graphql/gqlgen.gen.yml @@ -793,7 +793,6 @@ models: resolver: true createdAt: updatedAt: - deletedAt: name: status: apiVersion: @@ -805,7 +804,6 @@ models: resolver: true createdAt: updatedAt: - deletedAt: name: status: apiVersion: @@ -817,7 +815,6 @@ models: resolver: true createdAt: updatedAt: - deletedAt: name: status: apiVersion: @@ -831,7 +828,6 @@ models: resolver: true createdAt: updatedAt: - deletedAt: sigchain: status: devices: @@ -846,7 +842,6 @@ models: resolver: true createdAt: updatedAt: - deletedAt: sigchain: status: devices: @@ -861,7 +856,6 @@ models: resolver: true createdAt: updatedAt: - deletedAt: sigchain: status: devices: @@ -878,7 +872,6 @@ models: resolver: true createdAt: updatedAt: - deletedAt: title: topic: members: @@ -889,7 +882,6 @@ models: resolver: true createdAt: updatedAt: - deletedAt: title: topic: members: @@ -900,7 +892,6 @@ models: resolver: true createdAt: updatedAt: - deletedAt: title: topic: members: @@ -912,7 +903,6 @@ models: resolver: true createdAt: updatedAt: - deletedAt: status: contact: conversationId: @@ -924,7 +914,6 @@ models: resolver: true createdAt: updatedAt: - deletedAt: status: contact: conversationId: @@ -936,7 +925,6 @@ models: resolver: true createdAt: updatedAt: - deletedAt: status: contact: conversationId: @@ -963,7 +951,6 @@ models: id: createdAt: updatedAt: - deletedAt: status: originDeviceId: contactId: @@ -976,7 +963,6 @@ models: id: createdAt: updatedAt: - deletedAt: status: originDeviceId: contactId: @@ -989,7 +975,6 @@ models: id: createdAt: updatedAt: - deletedAt: status: originDeviceId: contactId: @@ -1175,7 +1160,6 @@ models: senderId: createdAt: updatedAt: - deletedAt: sentAt: receivedAt: ackedAt: @@ -1196,7 +1180,6 @@ models: senderId: createdAt: updatedAt: - deletedAt: sentAt: receivedAt: ackedAt: @@ -1217,7 +1200,6 @@ models: senderId: createdAt: updatedAt: - deletedAt: sentAt: receivedAt: ackedAt: diff --git a/core/api/node/graphql/graph/generated/generated.gen.go b/core/api/node/graphql/graph/generated/generated.gen.go index a3ac0d441d..e4e8eea674 100644 --- a/core/api/node/graphql/graph/generated/generated.gen.go +++ b/core/api/node/graphql/graph/generated/generated.gen.go @@ -64,7 +64,6 @@ type ComplexityRoot struct { Id func(childComplexity int) int CreatedAt func(childComplexity int) int UpdatedAt func(childComplexity int) int - DeletedAt func(childComplexity int) int Sigchain func(childComplexity int) int Status func(childComplexity int) int Devices func(childComplexity int) int @@ -78,7 +77,6 @@ type ComplexityRoot struct { Id func(childComplexity int) int CreatedAt func(childComplexity int) int UpdatedAt func(childComplexity int) int - DeletedAt func(childComplexity int) int Sigchain func(childComplexity int) int Status func(childComplexity int) int Devices func(childComplexity int) int @@ -92,7 +90,6 @@ type ComplexityRoot struct { Id func(childComplexity int) int CreatedAt func(childComplexity int) int UpdatedAt func(childComplexity int) int - DeletedAt func(childComplexity int) int Title func(childComplexity int) int Topic func(childComplexity int) int Members func(childComplexity int) int @@ -102,7 +99,6 @@ type ComplexityRoot struct { Id func(childComplexity int) int CreatedAt func(childComplexity int) int UpdatedAt func(childComplexity int) int - DeletedAt func(childComplexity int) int Status func(childComplexity int) int Contact func(childComplexity int) int ConversationId func(childComplexity int) int @@ -113,7 +109,6 @@ type ComplexityRoot struct { Id func(childComplexity int) int CreatedAt func(childComplexity int) int UpdatedAt func(childComplexity int) int - DeletedAt func(childComplexity int) int Status func(childComplexity int) int Contact func(childComplexity int) int ConversationId func(childComplexity int) int @@ -124,7 +119,6 @@ type ComplexityRoot struct { Id func(childComplexity int) int CreatedAt func(childComplexity int) int UpdatedAt func(childComplexity int) int - DeletedAt func(childComplexity int) int Title func(childComplexity int) int Topic func(childComplexity int) int Members func(childComplexity int) int @@ -134,7 +128,6 @@ type ComplexityRoot struct { Id func(childComplexity int) int CreatedAt func(childComplexity int) int UpdatedAt func(childComplexity int) int - DeletedAt func(childComplexity int) int Name func(childComplexity int) int Status func(childComplexity int) int ApiVersion func(childComplexity int) int @@ -149,7 +142,6 @@ type ComplexityRoot struct { Id func(childComplexity int) int CreatedAt func(childComplexity int) int UpdatedAt func(childComplexity int) int - DeletedAt func(childComplexity int) int Status func(childComplexity int) int OriginDeviceId func(childComplexity int) int ContactId func(childComplexity int) int @@ -328,7 +320,6 @@ type ComplexityRoot struct { SenderId func(childComplexity int) int CreatedAt func(childComplexity int) int UpdatedAt func(childComplexity int) int - DeletedAt func(childComplexity int) int SentAt func(childComplexity int) int ReceivedAt func(childComplexity int) int AckedAt func(childComplexity int) int @@ -346,7 +337,6 @@ type ComplexityRoot struct { SenderId func(childComplexity int) int CreatedAt func(childComplexity int) int UpdatedAt func(childComplexity int) int - DeletedAt func(childComplexity int) int SentAt func(childComplexity int) int ReceivedAt func(childComplexity int) int AckedAt func(childComplexity int) int @@ -616,9 +606,9 @@ type ComplexityRoot struct { Mutation struct { ContactRequest func(childComplexity int, contact *entity.Contact, introText string) int - ContactAcceptRequest func(childComplexity int, id string, createdAt *time.Time, updatedAt *time.Time, deletedAt *time.Time, sigchain []byte, status *int32, devices []*entity.Device, displayName string, displayStatus string, overrideDisplayName string, overrideDisplayStatus string) int - ContactRemove func(childComplexity int, id string, createdAt *time.Time, updatedAt *time.Time, deletedAt *time.Time, sigchain []byte, status *int32, devices []*entity.Device, displayName string, displayStatus string, overrideDisplayName string, overrideDisplayStatus string) int - ContactUpdate func(childComplexity int, id string, createdAt *time.Time, updatedAt *time.Time, deletedAt *time.Time, sigchain []byte, status *int32, devices []*entity.Device, displayName string, displayStatus string, overrideDisplayName string, overrideDisplayStatus string) int + ContactAcceptRequest func(childComplexity int, id string, createdAt *time.Time, updatedAt *time.Time, sigchain []byte, status *int32, devices []*entity.Device, displayName string, displayStatus string, overrideDisplayName string, overrideDisplayStatus string) int + ContactRemove func(childComplexity int, id string, createdAt *time.Time, updatedAt *time.Time, sigchain []byte, status *int32, devices []*entity.Device, displayName string, displayStatus string, overrideDisplayName string, overrideDisplayStatus string) int + ContactUpdate func(childComplexity int, id string, createdAt *time.Time, updatedAt *time.Time, sigchain []byte, status *int32, devices []*entity.Device, displayName string, displayStatus string, overrideDisplayName string, overrideDisplayStatus string) int ConversationCreate func(childComplexity int, contacts []*entity.Contact, title string, topic string) int ConversationInvite func(childComplexity int, conversation *entity.Conversation, members []*entity.ConversationMember) int ConversationExclude func(childComplexity int, conversation *entity.Conversation, members []*entity.ConversationMember) int @@ -633,12 +623,12 @@ type ComplexityRoot struct { Node func(childComplexity int, id string) int Id func(childComplexity int, T bool) int EventList func(childComplexity int, filter *p2p.Event, onlyWithoutAckedAt *int32, orderBy string, orderDesc bool, first *int32, after *string, last *int32, before *string) int - GetEvent func(childComplexity int, id string, senderId string, createdAt *time.Time, updatedAt *time.Time, deletedAt *time.Time, sentAt *time.Time, receivedAt *time.Time, ackedAt *time.Time, direction *int32, senderApiVersion uint32, receiverApiVersion uint32, receiverId string, kind *int32, attributes []byte, conversationId string) int + GetEvent func(childComplexity int, id string, senderId string, createdAt *time.Time, updatedAt *time.Time, sentAt *time.Time, receivedAt *time.Time, ackedAt *time.Time, direction *int32, senderApiVersion uint32, receiverApiVersion uint32, receiverId string, kind *int32, attributes []byte, conversationId string) int ContactList func(childComplexity int, filter *entity.Contact, orderBy string, orderDesc bool, first *int32, after *string, last *int32, before *string) int - GetContact func(childComplexity int, id string, createdAt *time.Time, updatedAt *time.Time, deletedAt *time.Time, sigchain []byte, status *int32, devices []*entity.Device, displayName string, displayStatus string, overrideDisplayName string, overrideDisplayStatus string) int + GetContact func(childComplexity int, id string, createdAt *time.Time, updatedAt *time.Time, sigchain []byte, status *int32, devices []*entity.Device, displayName string, displayStatus string, overrideDisplayName string, overrideDisplayStatus string) int ConversationList func(childComplexity int, filter *entity.Conversation, orderBy string, orderDesc bool, first *int32, after *string, last *int32, before *string) int - GetConversation func(childComplexity int, id string, createdAt *time.Time, updatedAt *time.Time, deletedAt *time.Time, title string, topic string, members []*entity.ConversationMember) int - GetConversationMember func(childComplexity int, id string, createdAt *time.Time, updatedAt *time.Time, deletedAt *time.Time, status *int32, contact *entity.Contact, conversationId string, contactId string) int + GetConversation func(childComplexity int, id string, createdAt *time.Time, updatedAt *time.Time, title string, topic string, members []*entity.ConversationMember) int + GetConversationMember func(childComplexity int, id string, createdAt *time.Time, updatedAt *time.Time, status *int32, contact *entity.Contact, conversationId string, contactId string) int DeviceInfos func(childComplexity int, T bool) int AppVersion func(childComplexity int, T bool) int Peers func(childComplexity int, T bool) int @@ -707,9 +697,9 @@ type GoogleProtobufMethodOptionsResolver interface { } type MutationResolver interface { ContactRequest(ctx context.Context, contact *entity.Contact, introText string) (*entity.Contact, error) - ContactAcceptRequest(ctx context.Context, id string, createdAt *time.Time, updatedAt *time.Time, deletedAt *time.Time, sigchain []byte, status *int32, devices []*entity.Device, displayName string, displayStatus string, overrideDisplayName string, overrideDisplayStatus string) (*entity.Contact, error) - ContactRemove(ctx context.Context, id string, createdAt *time.Time, updatedAt *time.Time, deletedAt *time.Time, sigchain []byte, status *int32, devices []*entity.Device, displayName string, displayStatus string, overrideDisplayName string, overrideDisplayStatus string) (*entity.Contact, error) - ContactUpdate(ctx context.Context, id string, createdAt *time.Time, updatedAt *time.Time, deletedAt *time.Time, sigchain []byte, status *int32, devices []*entity.Device, displayName string, displayStatus string, overrideDisplayName string, overrideDisplayStatus string) (*entity.Contact, error) + ContactAcceptRequest(ctx context.Context, id string, createdAt *time.Time, updatedAt *time.Time, sigchain []byte, status *int32, devices []*entity.Device, displayName string, displayStatus string, overrideDisplayName string, overrideDisplayStatus string) (*entity.Contact, error) + ContactRemove(ctx context.Context, id string, createdAt *time.Time, updatedAt *time.Time, sigchain []byte, status *int32, devices []*entity.Device, displayName string, displayStatus string, overrideDisplayName string, overrideDisplayStatus string) (*entity.Contact, error) + ContactUpdate(ctx context.Context, id string, createdAt *time.Time, updatedAt *time.Time, sigchain []byte, status *int32, devices []*entity.Device, displayName string, displayStatus string, overrideDisplayName string, overrideDisplayStatus string) (*entity.Contact, error) ConversationCreate(ctx context.Context, contacts []*entity.Contact, title string, topic string) (*entity.Conversation, error) ConversationInvite(ctx context.Context, conversation *entity.Conversation, members []*entity.ConversationMember) (*entity.Conversation, error) ConversationExclude(ctx context.Context, conversation *entity.Conversation, members []*entity.ConversationMember) (*entity.Conversation, error) @@ -723,12 +713,12 @@ type QueryResolver interface { Node(ctx context.Context, id string) (models.Node, error) ID(ctx context.Context, T bool) (*p2p.Peer, error) EventList(ctx context.Context, filter *p2p.Event, onlyWithoutAckedAt *int32, orderBy string, orderDesc bool, first *int32, after *string, last *int32, before *string) (*node.EventListConnection, error) - GetEvent(ctx context.Context, id string, senderId string, createdAt *time.Time, updatedAt *time.Time, deletedAt *time.Time, sentAt *time.Time, receivedAt *time.Time, ackedAt *time.Time, direction *int32, senderApiVersion uint32, receiverApiVersion uint32, receiverId string, kind *int32, attributes []byte, conversationId string) (*p2p.Event, error) + GetEvent(ctx context.Context, id string, senderId string, createdAt *time.Time, updatedAt *time.Time, sentAt *time.Time, receivedAt *time.Time, ackedAt *time.Time, direction *int32, senderApiVersion uint32, receiverApiVersion uint32, receiverId string, kind *int32, attributes []byte, conversationId string) (*p2p.Event, error) ContactList(ctx context.Context, filter *entity.Contact, orderBy string, orderDesc bool, first *int32, after *string, last *int32, before *string) (*node.ContactListConnection, error) - GetContact(ctx context.Context, id string, createdAt *time.Time, updatedAt *time.Time, deletedAt *time.Time, sigchain []byte, status *int32, devices []*entity.Device, displayName string, displayStatus string, overrideDisplayName string, overrideDisplayStatus string) (*entity.Contact, error) + GetContact(ctx context.Context, id string, createdAt *time.Time, updatedAt *time.Time, sigchain []byte, status *int32, devices []*entity.Device, displayName string, displayStatus string, overrideDisplayName string, overrideDisplayStatus string) (*entity.Contact, error) ConversationList(ctx context.Context, filter *entity.Conversation, orderBy string, orderDesc bool, first *int32, after *string, last *int32, before *string) (*node.ConversationListConnection, error) - GetConversation(ctx context.Context, id string, createdAt *time.Time, updatedAt *time.Time, deletedAt *time.Time, title string, topic string, members []*entity.ConversationMember) (*entity.Conversation, error) - GetConversationMember(ctx context.Context, id string, createdAt *time.Time, updatedAt *time.Time, deletedAt *time.Time, status *int32, contact *entity.Contact, conversationId string, contactId string) (*entity.ConversationMember, error) + GetConversation(ctx context.Context, id string, createdAt *time.Time, updatedAt *time.Time, title string, topic string, members []*entity.ConversationMember) (*entity.Conversation, error) + GetConversationMember(ctx context.Context, id string, createdAt *time.Time, updatedAt *time.Time, status *int32, contact *entity.Contact, conversationId string, contactId string) (*entity.ConversationMember, error) DeviceInfos(ctx context.Context, T bool) (*deviceinfo.DeviceInfos, error) AppVersion(ctx context.Context, T bool) (*node.AppVersionOutput, error) Peers(ctx context.Context, T bool) (*p2p.Peers, error) @@ -810,21 +800,7 @@ func field_Mutation_ContactAcceptRequest_args(rawArgs map[string]interface{}) (m } } args["updatedAt"] = arg2 - var arg3 *time.Time - if tmp, ok := rawArgs["deletedAt"]; ok { - var err error - var ptr1 time.Time - if tmp != nil { - ptr1, err = models.UnmarshalTime(tmp) - arg3 = &ptr1 - } - - if err != nil { - return nil, err - } - } - args["deletedAt"] = arg3 - var arg4 []byte + var arg3 []byte if tmp, ok := rawArgs["sigchain"]; ok { var err error var rawIf1 []interface{} @@ -835,30 +811,30 @@ func field_Mutation_ContactAcceptRequest_args(rawArgs map[string]interface{}) (m rawIf1 = []interface{}{tmp} } } - arg4 = make([]byte, len(rawIf1)) + arg3 = make([]byte, len(rawIf1)) for idx1 := range rawIf1 { - arg4[idx1], err = models.UnmarshalByte(rawIf1[idx1]) + arg3[idx1], err = models.UnmarshalByte(rawIf1[idx1]) } if err != nil { return nil, err } } - args["sigchain"] = arg4 - var arg5 *int32 + args["sigchain"] = arg3 + var arg4 *int32 if tmp, ok := rawArgs["status"]; ok { var err error var ptr1 int32 if tmp != nil { ptr1, err = models.UnmarshalEnum(tmp) - arg5 = &ptr1 + arg4 = &ptr1 } if err != nil { return nil, err } } - args["status"] = arg5 - var arg6 []*entity.Device + args["status"] = arg4 + var arg5 []*entity.Device if tmp, ok := rawArgs["devices"]; ok { var err error var rawIf1 []interface{} @@ -869,55 +845,55 @@ func field_Mutation_ContactAcceptRequest_args(rawArgs map[string]interface{}) (m rawIf1 = []interface{}{tmp} } } - arg6 = make([]*entity.Device, len(rawIf1)) + arg5 = make([]*entity.Device, len(rawIf1)) for idx1 := range rawIf1 { var ptr2 entity.Device if rawIf1[idx1] != nil { ptr2, err = UnmarshalBertyEntityDeviceInput(rawIf1[idx1]) - arg6[idx1] = &ptr2 + arg5[idx1] = &ptr2 } } if err != nil { return nil, err } } - args["devices"] = arg6 - var arg7 string + args["devices"] = arg5 + var arg6 string if tmp, ok := rawArgs["displayName"]; ok { var err error - arg7, err = models.UnmarshalString(tmp) + arg6, err = models.UnmarshalString(tmp) if err != nil { return nil, err } } - args["displayName"] = arg7 - var arg8 string + args["displayName"] = arg6 + var arg7 string if tmp, ok := rawArgs["displayStatus"]; ok { var err error - arg8, err = models.UnmarshalString(tmp) + arg7, err = models.UnmarshalString(tmp) if err != nil { return nil, err } } - args["displayStatus"] = arg8 - var arg9 string + args["displayStatus"] = arg7 + var arg8 string if tmp, ok := rawArgs["overrideDisplayName"]; ok { var err error - arg9, err = models.UnmarshalString(tmp) + arg8, err = models.UnmarshalString(tmp) if err != nil { return nil, err } } - args["overrideDisplayName"] = arg9 - var arg10 string + args["overrideDisplayName"] = arg8 + var arg9 string if tmp, ok := rawArgs["overrideDisplayStatus"]; ok { var err error - arg10, err = models.UnmarshalString(tmp) + arg9, err = models.UnmarshalString(tmp) if err != nil { return nil, err } } - args["overrideDisplayStatus"] = arg10 + args["overrideDisplayStatus"] = arg9 return args, nil } @@ -961,21 +937,7 @@ func field_Mutation_ContactRemove_args(rawArgs map[string]interface{}) (map[stri } } args["updatedAt"] = arg2 - var arg3 *time.Time - if tmp, ok := rawArgs["deletedAt"]; ok { - var err error - var ptr1 time.Time - if tmp != nil { - ptr1, err = models.UnmarshalTime(tmp) - arg3 = &ptr1 - } - - if err != nil { - return nil, err - } - } - args["deletedAt"] = arg3 - var arg4 []byte + var arg3 []byte if tmp, ok := rawArgs["sigchain"]; ok { var err error var rawIf1 []interface{} @@ -986,30 +948,30 @@ func field_Mutation_ContactRemove_args(rawArgs map[string]interface{}) (map[stri rawIf1 = []interface{}{tmp} } } - arg4 = make([]byte, len(rawIf1)) + arg3 = make([]byte, len(rawIf1)) for idx1 := range rawIf1 { - arg4[idx1], err = models.UnmarshalByte(rawIf1[idx1]) + arg3[idx1], err = models.UnmarshalByte(rawIf1[idx1]) } if err != nil { return nil, err } } - args["sigchain"] = arg4 - var arg5 *int32 + args["sigchain"] = arg3 + var arg4 *int32 if tmp, ok := rawArgs["status"]; ok { var err error var ptr1 int32 if tmp != nil { ptr1, err = models.UnmarshalEnum(tmp) - arg5 = &ptr1 + arg4 = &ptr1 } if err != nil { return nil, err } } - args["status"] = arg5 - var arg6 []*entity.Device + args["status"] = arg4 + var arg5 []*entity.Device if tmp, ok := rawArgs["devices"]; ok { var err error var rawIf1 []interface{} @@ -1020,55 +982,55 @@ func field_Mutation_ContactRemove_args(rawArgs map[string]interface{}) (map[stri rawIf1 = []interface{}{tmp} } } - arg6 = make([]*entity.Device, len(rawIf1)) + arg5 = make([]*entity.Device, len(rawIf1)) for idx1 := range rawIf1 { var ptr2 entity.Device if rawIf1[idx1] != nil { ptr2, err = UnmarshalBertyEntityDeviceInput(rawIf1[idx1]) - arg6[idx1] = &ptr2 + arg5[idx1] = &ptr2 } } if err != nil { return nil, err } } - args["devices"] = arg6 - var arg7 string + args["devices"] = arg5 + var arg6 string if tmp, ok := rawArgs["displayName"]; ok { var err error - arg7, err = models.UnmarshalString(tmp) + arg6, err = models.UnmarshalString(tmp) if err != nil { return nil, err } } - args["displayName"] = arg7 - var arg8 string + args["displayName"] = arg6 + var arg7 string if tmp, ok := rawArgs["displayStatus"]; ok { var err error - arg8, err = models.UnmarshalString(tmp) + arg7, err = models.UnmarshalString(tmp) if err != nil { return nil, err } } - args["displayStatus"] = arg8 - var arg9 string + args["displayStatus"] = arg7 + var arg8 string if tmp, ok := rawArgs["overrideDisplayName"]; ok { var err error - arg9, err = models.UnmarshalString(tmp) + arg8, err = models.UnmarshalString(tmp) if err != nil { return nil, err } } - args["overrideDisplayName"] = arg9 - var arg10 string + args["overrideDisplayName"] = arg8 + var arg9 string if tmp, ok := rawArgs["overrideDisplayStatus"]; ok { var err error - arg10, err = models.UnmarshalString(tmp) + arg9, err = models.UnmarshalString(tmp) if err != nil { return nil, err } } - args["overrideDisplayStatus"] = arg10 + args["overrideDisplayStatus"] = arg9 return args, nil } @@ -1112,21 +1074,7 @@ func field_Mutation_ContactUpdate_args(rawArgs map[string]interface{}) (map[stri } } args["updatedAt"] = arg2 - var arg3 *time.Time - if tmp, ok := rawArgs["deletedAt"]; ok { - var err error - var ptr1 time.Time - if tmp != nil { - ptr1, err = models.UnmarshalTime(tmp) - arg3 = &ptr1 - } - - if err != nil { - return nil, err - } - } - args["deletedAt"] = arg3 - var arg4 []byte + var arg3 []byte if tmp, ok := rawArgs["sigchain"]; ok { var err error var rawIf1 []interface{} @@ -1137,30 +1085,30 @@ func field_Mutation_ContactUpdate_args(rawArgs map[string]interface{}) (map[stri rawIf1 = []interface{}{tmp} } } - arg4 = make([]byte, len(rawIf1)) + arg3 = make([]byte, len(rawIf1)) for idx1 := range rawIf1 { - arg4[idx1], err = models.UnmarshalByte(rawIf1[idx1]) + arg3[idx1], err = models.UnmarshalByte(rawIf1[idx1]) } if err != nil { return nil, err } } - args["sigchain"] = arg4 - var arg5 *int32 + args["sigchain"] = arg3 + var arg4 *int32 if tmp, ok := rawArgs["status"]; ok { var err error var ptr1 int32 if tmp != nil { ptr1, err = models.UnmarshalEnum(tmp) - arg5 = &ptr1 + arg4 = &ptr1 } if err != nil { return nil, err } } - args["status"] = arg5 - var arg6 []*entity.Device + args["status"] = arg4 + var arg5 []*entity.Device if tmp, ok := rawArgs["devices"]; ok { var err error var rawIf1 []interface{} @@ -1171,55 +1119,55 @@ func field_Mutation_ContactUpdate_args(rawArgs map[string]interface{}) (map[stri rawIf1 = []interface{}{tmp} } } - arg6 = make([]*entity.Device, len(rawIf1)) + arg5 = make([]*entity.Device, len(rawIf1)) for idx1 := range rawIf1 { var ptr2 entity.Device if rawIf1[idx1] != nil { ptr2, err = UnmarshalBertyEntityDeviceInput(rawIf1[idx1]) - arg6[idx1] = &ptr2 + arg5[idx1] = &ptr2 } } if err != nil { return nil, err } } - args["devices"] = arg6 - var arg7 string + args["devices"] = arg5 + var arg6 string if tmp, ok := rawArgs["displayName"]; ok { var err error - arg7, err = models.UnmarshalString(tmp) + arg6, err = models.UnmarshalString(tmp) if err != nil { return nil, err } } - args["displayName"] = arg7 - var arg8 string + args["displayName"] = arg6 + var arg7 string if tmp, ok := rawArgs["displayStatus"]; ok { var err error - arg8, err = models.UnmarshalString(tmp) + arg7, err = models.UnmarshalString(tmp) if err != nil { return nil, err } } - args["displayStatus"] = arg8 - var arg9 string + args["displayStatus"] = arg7 + var arg8 string if tmp, ok := rawArgs["overrideDisplayName"]; ok { var err error - arg9, err = models.UnmarshalString(tmp) + arg8, err = models.UnmarshalString(tmp) if err != nil { return nil, err } } - args["overrideDisplayName"] = arg9 - var arg10 string + args["overrideDisplayName"] = arg8 + var arg9 string if tmp, ok := rawArgs["overrideDisplayStatus"]; ok { var err error - arg10, err = models.UnmarshalString(tmp) + arg9, err = models.UnmarshalString(tmp) if err != nil { return nil, err } } - args["overrideDisplayStatus"] = arg10 + args["overrideDisplayStatus"] = arg9 return args, nil } @@ -1641,7 +1589,7 @@ func field_Query_GetEvent_args(rawArgs map[string]interface{}) (map[string]inter } args["updatedAt"] = arg3 var arg4 *time.Time - if tmp, ok := rawArgs["deletedAt"]; ok { + if tmp, ok := rawArgs["sentAt"]; ok { var err error var ptr1 time.Time if tmp != nil { @@ -1653,9 +1601,9 @@ func field_Query_GetEvent_args(rawArgs map[string]interface{}) (map[string]inter return nil, err } } - args["deletedAt"] = arg4 + args["sentAt"] = arg4 var arg5 *time.Time - if tmp, ok := rawArgs["sentAt"]; ok { + if tmp, ok := rawArgs["receivedAt"]; ok { var err error var ptr1 time.Time if tmp != nil { @@ -1667,91 +1615,77 @@ func field_Query_GetEvent_args(rawArgs map[string]interface{}) (map[string]inter return nil, err } } - args["sentAt"] = arg5 + args["receivedAt"] = arg5 var arg6 *time.Time - if tmp, ok := rawArgs["receivedAt"]; ok { - var err error - var ptr1 time.Time - if tmp != nil { - ptr1, err = models.UnmarshalTime(tmp) - arg6 = &ptr1 - } - - if err != nil { - return nil, err - } - } - args["receivedAt"] = arg6 - var arg7 *time.Time if tmp, ok := rawArgs["ackedAt"]; ok { var err error var ptr1 time.Time if tmp != nil { ptr1, err = models.UnmarshalTime(tmp) - arg7 = &ptr1 + arg6 = &ptr1 } if err != nil { return nil, err } } - args["ackedAt"] = arg7 - var arg8 *int32 + args["ackedAt"] = arg6 + var arg7 *int32 if tmp, ok := rawArgs["direction"]; ok { var err error var ptr1 int32 if tmp != nil { ptr1, err = models.UnmarshalEnum(tmp) - arg8 = &ptr1 + arg7 = &ptr1 } if err != nil { return nil, err } } - args["direction"] = arg8 - var arg9 uint32 + args["direction"] = arg7 + var arg8 uint32 if tmp, ok := rawArgs["senderApiVersion"]; ok { var err error - arg9, err = models.UnmarshalUint32(tmp) + arg8, err = models.UnmarshalUint32(tmp) if err != nil { return nil, err } } - args["senderApiVersion"] = arg9 - var arg10 uint32 + args["senderApiVersion"] = arg8 + var arg9 uint32 if tmp, ok := rawArgs["receiverApiVersion"]; ok { var err error - arg10, err = models.UnmarshalUint32(tmp) + arg9, err = models.UnmarshalUint32(tmp) if err != nil { return nil, err } } - args["receiverApiVersion"] = arg10 - var arg11 string + args["receiverApiVersion"] = arg9 + var arg10 string if tmp, ok := rawArgs["receiverId"]; ok { var err error - arg11, err = models.UnmarshalString(tmp) + arg10, err = models.UnmarshalString(tmp) if err != nil { return nil, err } } - args["receiverId"] = arg11 - var arg12 *int32 + args["receiverId"] = arg10 + var arg11 *int32 if tmp, ok := rawArgs["kind"]; ok { var err error var ptr1 int32 if tmp != nil { ptr1, err = models.UnmarshalEnum(tmp) - arg12 = &ptr1 + arg11 = &ptr1 } if err != nil { return nil, err } } - args["kind"] = arg12 - var arg13 []byte + args["kind"] = arg11 + var arg12 []byte if tmp, ok := rawArgs["attributes"]; ok { var err error var rawIf1 []interface{} @@ -1762,24 +1696,24 @@ func field_Query_GetEvent_args(rawArgs map[string]interface{}) (map[string]inter rawIf1 = []interface{}{tmp} } } - arg13 = make([]byte, len(rawIf1)) + arg12 = make([]byte, len(rawIf1)) for idx1 := range rawIf1 { - arg13[idx1], err = models.UnmarshalByte(rawIf1[idx1]) + arg12[idx1], err = models.UnmarshalByte(rawIf1[idx1]) } if err != nil { return nil, err } } - args["attributes"] = arg13 - var arg14 string + args["attributes"] = arg12 + var arg13 string if tmp, ok := rawArgs["conversationId"]; ok { var err error - arg14, err = models.UnmarshalID(tmp) + arg13, err = models.UnmarshalID(tmp) if err != nil { return nil, err } } - args["conversationId"] = arg14 + args["conversationId"] = arg13 return args, nil } @@ -1917,21 +1851,7 @@ func field_Query_GetContact_args(rawArgs map[string]interface{}) (map[string]int } } args["updatedAt"] = arg2 - var arg3 *time.Time - if tmp, ok := rawArgs["deletedAt"]; ok { - var err error - var ptr1 time.Time - if tmp != nil { - ptr1, err = models.UnmarshalTime(tmp) - arg3 = &ptr1 - } - - if err != nil { - return nil, err - } - } - args["deletedAt"] = arg3 - var arg4 []byte + var arg3 []byte if tmp, ok := rawArgs["sigchain"]; ok { var err error var rawIf1 []interface{} @@ -1942,30 +1862,30 @@ func field_Query_GetContact_args(rawArgs map[string]interface{}) (map[string]int rawIf1 = []interface{}{tmp} } } - arg4 = make([]byte, len(rawIf1)) + arg3 = make([]byte, len(rawIf1)) for idx1 := range rawIf1 { - arg4[idx1], err = models.UnmarshalByte(rawIf1[idx1]) + arg3[idx1], err = models.UnmarshalByte(rawIf1[idx1]) } if err != nil { return nil, err } } - args["sigchain"] = arg4 - var arg5 *int32 + args["sigchain"] = arg3 + var arg4 *int32 if tmp, ok := rawArgs["status"]; ok { var err error var ptr1 int32 if tmp != nil { ptr1, err = models.UnmarshalEnum(tmp) - arg5 = &ptr1 + arg4 = &ptr1 } if err != nil { return nil, err } } - args["status"] = arg5 - var arg6 []*entity.Device + args["status"] = arg4 + var arg5 []*entity.Device if tmp, ok := rawArgs["devices"]; ok { var err error var rawIf1 []interface{} @@ -1976,55 +1896,55 @@ func field_Query_GetContact_args(rawArgs map[string]interface{}) (map[string]int rawIf1 = []interface{}{tmp} } } - arg6 = make([]*entity.Device, len(rawIf1)) + arg5 = make([]*entity.Device, len(rawIf1)) for idx1 := range rawIf1 { var ptr2 entity.Device if rawIf1[idx1] != nil { ptr2, err = UnmarshalBertyEntityDeviceInput(rawIf1[idx1]) - arg6[idx1] = &ptr2 + arg5[idx1] = &ptr2 } } if err != nil { return nil, err } } - args["devices"] = arg6 - var arg7 string + args["devices"] = arg5 + var arg6 string if tmp, ok := rawArgs["displayName"]; ok { var err error - arg7, err = models.UnmarshalString(tmp) + arg6, err = models.UnmarshalString(tmp) if err != nil { return nil, err } } - args["displayName"] = arg7 - var arg8 string + args["displayName"] = arg6 + var arg7 string if tmp, ok := rawArgs["displayStatus"]; ok { var err error - arg8, err = models.UnmarshalString(tmp) + arg7, err = models.UnmarshalString(tmp) if err != nil { return nil, err } } - args["displayStatus"] = arg8 - var arg9 string + args["displayStatus"] = arg7 + var arg8 string if tmp, ok := rawArgs["overrideDisplayName"]; ok { var err error - arg9, err = models.UnmarshalString(tmp) + arg8, err = models.UnmarshalString(tmp) if err != nil { return nil, err } } - args["overrideDisplayName"] = arg9 - var arg10 string + args["overrideDisplayName"] = arg8 + var arg9 string if tmp, ok := rawArgs["overrideDisplayStatus"]; ok { var err error - arg10, err = models.UnmarshalString(tmp) + arg9, err = models.UnmarshalString(tmp) if err != nil { return nil, err } } - args["overrideDisplayStatus"] = arg10 + args["overrideDisplayStatus"] = arg9 return args, nil } @@ -2162,39 +2082,25 @@ func field_Query_GetConversation_args(rawArgs map[string]interface{}) (map[strin } } args["updatedAt"] = arg2 - var arg3 *time.Time - if tmp, ok := rawArgs["deletedAt"]; ok { - var err error - var ptr1 time.Time - if tmp != nil { - ptr1, err = models.UnmarshalTime(tmp) - arg3 = &ptr1 - } - - if err != nil { - return nil, err - } - } - args["deletedAt"] = arg3 - var arg4 string + var arg3 string if tmp, ok := rawArgs["title"]; ok { var err error - arg4, err = models.UnmarshalString(tmp) + arg3, err = models.UnmarshalString(tmp) if err != nil { return nil, err } } - args["title"] = arg4 - var arg5 string + args["title"] = arg3 + var arg4 string if tmp, ok := rawArgs["topic"]; ok { var err error - arg5, err = models.UnmarshalString(tmp) + arg4, err = models.UnmarshalString(tmp) if err != nil { return nil, err } } - args["topic"] = arg5 - var arg6 []*entity.ConversationMember + args["topic"] = arg4 + var arg5 []*entity.ConversationMember if tmp, ok := rawArgs["members"]; ok { var err error var rawIf1 []interface{} @@ -2205,19 +2111,19 @@ func field_Query_GetConversation_args(rawArgs map[string]interface{}) (map[strin rawIf1 = []interface{}{tmp} } } - arg6 = make([]*entity.ConversationMember, len(rawIf1)) + arg5 = make([]*entity.ConversationMember, len(rawIf1)) for idx1 := range rawIf1 { var ptr2 entity.ConversationMember if rawIf1[idx1] != nil { ptr2, err = UnmarshalBertyEntityConversationMemberInput(rawIf1[idx1]) - arg6[idx1] = &ptr2 + arg5[idx1] = &ptr2 } } if err != nil { return nil, err } } - args["members"] = arg6 + args["members"] = arg5 return args, nil } @@ -2261,66 +2167,52 @@ func field_Query_GetConversationMember_args(rawArgs map[string]interface{}) (map } } args["updatedAt"] = arg2 - var arg3 *time.Time - if tmp, ok := rawArgs["deletedAt"]; ok { - var err error - var ptr1 time.Time - if tmp != nil { - ptr1, err = models.UnmarshalTime(tmp) - arg3 = &ptr1 - } - - if err != nil { - return nil, err - } - } - args["deletedAt"] = arg3 - var arg4 *int32 + var arg3 *int32 if tmp, ok := rawArgs["status"]; ok { var err error var ptr1 int32 if tmp != nil { ptr1, err = models.UnmarshalEnum(tmp) - arg4 = &ptr1 + arg3 = &ptr1 } if err != nil { return nil, err } } - args["status"] = arg4 - var arg5 *entity.Contact + args["status"] = arg3 + var arg4 *entity.Contact if tmp, ok := rawArgs["contact"]; ok { var err error var ptr1 entity.Contact if tmp != nil { ptr1, err = UnmarshalBertyEntityContactInput(tmp) - arg5 = &ptr1 + arg4 = &ptr1 } if err != nil { return nil, err } } - args["contact"] = arg5 - var arg6 string + args["contact"] = arg4 + var arg5 string if tmp, ok := rawArgs["conversationId"]; ok { var err error - arg6, err = models.UnmarshalString(tmp) + arg5, err = models.UnmarshalString(tmp) if err != nil { return nil, err } } - args["conversationId"] = arg6 - var arg7 string + args["conversationId"] = arg5 + var arg6 string if tmp, ok := rawArgs["contactId"]; ok { var err error - arg7, err = models.UnmarshalString(tmp) + arg6, err = models.UnmarshalString(tmp) if err != nil { return nil, err } } - args["contactId"] = arg7 + args["contactId"] = arg6 return args, nil } @@ -2680,13 +2572,6 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in return e.complexity.BertyEntityContact.UpdatedAt(childComplexity), true - case "BertyEntityContact.deletedAt": - if e.complexity.BertyEntityContact.DeletedAt == nil { - break - } - - return e.complexity.BertyEntityContact.DeletedAt(childComplexity), true - case "BertyEntityContact.sigchain": if e.complexity.BertyEntityContact.Sigchain == nil { break @@ -2757,13 +2642,6 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in return e.complexity.BertyEntityContactPayload.UpdatedAt(childComplexity), true - case "BertyEntityContactPayload.deletedAt": - if e.complexity.BertyEntityContactPayload.DeletedAt == nil { - break - } - - return e.complexity.BertyEntityContactPayload.DeletedAt(childComplexity), true - case "BertyEntityContactPayload.sigchain": if e.complexity.BertyEntityContactPayload.Sigchain == nil { break @@ -2834,13 +2712,6 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in return e.complexity.BertyEntityConversation.UpdatedAt(childComplexity), true - case "BertyEntityConversation.deletedAt": - if e.complexity.BertyEntityConversation.DeletedAt == nil { - break - } - - return e.complexity.BertyEntityConversation.DeletedAt(childComplexity), true - case "BertyEntityConversation.title": if e.complexity.BertyEntityConversation.Title == nil { break @@ -2883,13 +2754,6 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in return e.complexity.BertyEntityConversationMember.UpdatedAt(childComplexity), true - case "BertyEntityConversationMember.deletedAt": - if e.complexity.BertyEntityConversationMember.DeletedAt == nil { - break - } - - return e.complexity.BertyEntityConversationMember.DeletedAt(childComplexity), true - case "BertyEntityConversationMember.status": if e.complexity.BertyEntityConversationMember.Status == nil { break @@ -2939,13 +2803,6 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in return e.complexity.BertyEntityConversationMemberPayload.UpdatedAt(childComplexity), true - case "BertyEntityConversationMemberPayload.deletedAt": - if e.complexity.BertyEntityConversationMemberPayload.DeletedAt == nil { - break - } - - return e.complexity.BertyEntityConversationMemberPayload.DeletedAt(childComplexity), true - case "BertyEntityConversationMemberPayload.status": if e.complexity.BertyEntityConversationMemberPayload.Status == nil { break @@ -2995,13 +2852,6 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in return e.complexity.BertyEntityConversationPayload.UpdatedAt(childComplexity), true - case "BertyEntityConversationPayload.deletedAt": - if e.complexity.BertyEntityConversationPayload.DeletedAt == nil { - break - } - - return e.complexity.BertyEntityConversationPayload.DeletedAt(childComplexity), true - case "BertyEntityConversationPayload.title": if e.complexity.BertyEntityConversationPayload.Title == nil { break @@ -3044,13 +2894,6 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in return e.complexity.BertyEntityDevice.UpdatedAt(childComplexity), true - case "BertyEntityDevice.deletedAt": - if e.complexity.BertyEntityDevice.DeletedAt == nil { - break - } - - return e.complexity.BertyEntityDevice.DeletedAt(childComplexity), true - case "BertyEntityDevice.name": if e.complexity.BertyEntityDevice.Name == nil { break @@ -3107,13 +2950,6 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in return e.complexity.BertyEntitySenderAlias.UpdatedAt(childComplexity), true - case "BertyEntitySenderAlias.deletedAt": - if e.complexity.BertyEntitySenderAlias.DeletedAt == nil { - break - } - - return e.complexity.BertyEntitySenderAlias.DeletedAt(childComplexity), true - case "BertyEntitySenderAlias.status": if e.complexity.BertyEntitySenderAlias.Status == nil { break @@ -3646,13 +3482,6 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in return e.complexity.BertyP2pEvent.UpdatedAt(childComplexity), true - case "BertyP2pEvent.deletedAt": - if e.complexity.BertyP2pEvent.DeletedAt == nil { - break - } - - return e.complexity.BertyP2pEvent.DeletedAt(childComplexity), true - case "BertyP2pEvent.sentAt": if e.complexity.BertyP2pEvent.SentAt == nil { break @@ -3751,13 +3580,6 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in return e.complexity.BertyP2pEventPayload.UpdatedAt(childComplexity), true - case "BertyP2pEventPayload.deletedAt": - if e.complexity.BertyP2pEventPayload.DeletedAt == nil { - break - } - - return e.complexity.BertyP2pEventPayload.DeletedAt(childComplexity), true - case "BertyP2pEventPayload.sentAt": if e.complexity.BertyP2pEventPayload.SentAt == nil { break @@ -4837,7 +4659,7 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in return 0, false } - return e.complexity.Mutation.ContactAcceptRequest(childComplexity, args["id"].(string), args["createdAt"].(*time.Time), args["updatedAt"].(*time.Time), args["deletedAt"].(*time.Time), args["sigchain"].([]byte), args["status"].(*int32), args["devices"].([]*entity.Device), args["displayName"].(string), args["displayStatus"].(string), args["overrideDisplayName"].(string), args["overrideDisplayStatus"].(string)), true + return e.complexity.Mutation.ContactAcceptRequest(childComplexity, args["id"].(string), args["createdAt"].(*time.Time), args["updatedAt"].(*time.Time), args["sigchain"].([]byte), args["status"].(*int32), args["devices"].([]*entity.Device), args["displayName"].(string), args["displayStatus"].(string), args["overrideDisplayName"].(string), args["overrideDisplayStatus"].(string)), true case "Mutation.ContactRemove": if e.complexity.Mutation.ContactRemove == nil { @@ -4849,7 +4671,7 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in return 0, false } - return e.complexity.Mutation.ContactRemove(childComplexity, args["id"].(string), args["createdAt"].(*time.Time), args["updatedAt"].(*time.Time), args["deletedAt"].(*time.Time), args["sigchain"].([]byte), args["status"].(*int32), args["devices"].([]*entity.Device), args["displayName"].(string), args["displayStatus"].(string), args["overrideDisplayName"].(string), args["overrideDisplayStatus"].(string)), true + return e.complexity.Mutation.ContactRemove(childComplexity, args["id"].(string), args["createdAt"].(*time.Time), args["updatedAt"].(*time.Time), args["sigchain"].([]byte), args["status"].(*int32), args["devices"].([]*entity.Device), args["displayName"].(string), args["displayStatus"].(string), args["overrideDisplayName"].(string), args["overrideDisplayStatus"].(string)), true case "Mutation.ContactUpdate": if e.complexity.Mutation.ContactUpdate == nil { @@ -4861,7 +4683,7 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in return 0, false } - return e.complexity.Mutation.ContactUpdate(childComplexity, args["id"].(string), args["createdAt"].(*time.Time), args["updatedAt"].(*time.Time), args["deletedAt"].(*time.Time), args["sigchain"].([]byte), args["status"].(*int32), args["devices"].([]*entity.Device), args["displayName"].(string), args["displayStatus"].(string), args["overrideDisplayName"].(string), args["overrideDisplayStatus"].(string)), true + return e.complexity.Mutation.ContactUpdate(childComplexity, args["id"].(string), args["createdAt"].(*time.Time), args["updatedAt"].(*time.Time), args["sigchain"].([]byte), args["status"].(*int32), args["devices"].([]*entity.Device), args["displayName"].(string), args["displayStatus"].(string), args["overrideDisplayName"].(string), args["overrideDisplayStatus"].(string)), true case "Mutation.ConversationCreate": if e.complexity.Mutation.ConversationCreate == nil { @@ -5005,7 +4827,7 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in return 0, false } - return e.complexity.Query.GetEvent(childComplexity, args["id"].(string), args["senderId"].(string), args["createdAt"].(*time.Time), args["updatedAt"].(*time.Time), args["deletedAt"].(*time.Time), args["sentAt"].(*time.Time), args["receivedAt"].(*time.Time), args["ackedAt"].(*time.Time), args["direction"].(*int32), args["senderApiVersion"].(uint32), args["receiverApiVersion"].(uint32), args["receiverId"].(string), args["kind"].(*int32), args["attributes"].([]byte), args["conversationId"].(string)), true + return e.complexity.Query.GetEvent(childComplexity, args["id"].(string), args["senderId"].(string), args["createdAt"].(*time.Time), args["updatedAt"].(*time.Time), args["sentAt"].(*time.Time), args["receivedAt"].(*time.Time), args["ackedAt"].(*time.Time), args["direction"].(*int32), args["senderApiVersion"].(uint32), args["receiverApiVersion"].(uint32), args["receiverId"].(string), args["kind"].(*int32), args["attributes"].([]byte), args["conversationId"].(string)), true case "Query.ContactList": if e.complexity.Query.ContactList == nil { @@ -5029,7 +4851,7 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in return 0, false } - return e.complexity.Query.GetContact(childComplexity, args["id"].(string), args["createdAt"].(*time.Time), args["updatedAt"].(*time.Time), args["deletedAt"].(*time.Time), args["sigchain"].([]byte), args["status"].(*int32), args["devices"].([]*entity.Device), args["displayName"].(string), args["displayStatus"].(string), args["overrideDisplayName"].(string), args["overrideDisplayStatus"].(string)), true + return e.complexity.Query.GetContact(childComplexity, args["id"].(string), args["createdAt"].(*time.Time), args["updatedAt"].(*time.Time), args["sigchain"].([]byte), args["status"].(*int32), args["devices"].([]*entity.Device), args["displayName"].(string), args["displayStatus"].(string), args["overrideDisplayName"].(string), args["overrideDisplayStatus"].(string)), true case "Query.ConversationList": if e.complexity.Query.ConversationList == nil { @@ -5053,7 +4875,7 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in return 0, false } - return e.complexity.Query.GetConversation(childComplexity, args["id"].(string), args["createdAt"].(*time.Time), args["updatedAt"].(*time.Time), args["deletedAt"].(*time.Time), args["title"].(string), args["topic"].(string), args["members"].([]*entity.ConversationMember)), true + return e.complexity.Query.GetConversation(childComplexity, args["id"].(string), args["createdAt"].(*time.Time), args["updatedAt"].(*time.Time), args["title"].(string), args["topic"].(string), args["members"].([]*entity.ConversationMember)), true case "Query.GetConversationMember": if e.complexity.Query.GetConversationMember == nil { @@ -5065,7 +4887,7 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in return 0, false } - return e.complexity.Query.GetConversationMember(childComplexity, args["id"].(string), args["createdAt"].(*time.Time), args["updatedAt"].(*time.Time), args["deletedAt"].(*time.Time), args["status"].(*int32), args["contact"].(*entity.Contact), args["conversationId"].(string), args["contactId"].(string)), true + return e.complexity.Query.GetConversationMember(childComplexity, args["id"].(string), args["createdAt"].(*time.Time), args["updatedAt"].(*time.Time), args["status"].(*int32), args["contact"].(*entity.Contact), args["conversationId"].(string), args["contactId"].(string)), true case "Query.DeviceInfos": if e.complexity.Query.DeviceInfos == nil { @@ -5278,8 +5100,6 @@ func (ec *executionContext) _BertyEntityContact(ctx context.Context, sel ast.Sel out.Values[i] = ec._BertyEntityContact_createdAt(ctx, field, obj) case "updatedAt": out.Values[i] = ec._BertyEntityContact_updatedAt(ctx, field, obj) - case "deletedAt": - out.Values[i] = ec._BertyEntityContact_deletedAt(ctx, field, obj) case "sigchain": out.Values[i] = ec._BertyEntityContact_sigchain(ctx, field, obj) case "status": @@ -5380,30 +5200,6 @@ func (ec *executionContext) _BertyEntityContact_updatedAt(ctx context.Context, f return models.MarshalTime(res) } -// nolint: vetshadow -func (ec *executionContext) _BertyEntityContact_deletedAt(ctx context.Context, field graphql.CollectedField, obj *entity.Contact) graphql.Marshaler { - rctx := &graphql.ResolverContext{ - Object: "BertyEntityContact", - Args: nil, - Field: field, - } - ctx = graphql.WithResolverContext(ctx, rctx) - resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) { - ctx = rctx // use context from middleware stack in children - return obj.DeletedAt, nil - }) - if resTmp == nil { - return graphql.Null - } - res := resTmp.(*time.Time) - rctx.Result = res - - if res == nil { - return graphql.Null - } - return models.MarshalTime(*res) -} - // nolint: vetshadow func (ec *executionContext) _BertyEntityContact_sigchain(ctx context.Context, field graphql.CollectedField, obj *entity.Contact) graphql.Marshaler { rctx := &graphql.ResolverContext{ @@ -5630,8 +5426,6 @@ func (ec *executionContext) _BertyEntityContactPayload(ctx context.Context, sel out.Values[i] = ec._BertyEntityContactPayload_createdAt(ctx, field, obj) case "updatedAt": out.Values[i] = ec._BertyEntityContactPayload_updatedAt(ctx, field, obj) - case "deletedAt": - out.Values[i] = ec._BertyEntityContactPayload_deletedAt(ctx, field, obj) case "sigchain": out.Values[i] = ec._BertyEntityContactPayload_sigchain(ctx, field, obj) case "status": @@ -5732,30 +5526,6 @@ func (ec *executionContext) _BertyEntityContactPayload_updatedAt(ctx context.Con return models.MarshalTime(res) } -// nolint: vetshadow -func (ec *executionContext) _BertyEntityContactPayload_deletedAt(ctx context.Context, field graphql.CollectedField, obj *entity.Contact) graphql.Marshaler { - rctx := &graphql.ResolverContext{ - Object: "BertyEntityContactPayload", - Args: nil, - Field: field, - } - ctx = graphql.WithResolverContext(ctx, rctx) - resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) { - ctx = rctx // use context from middleware stack in children - return obj.DeletedAt, nil - }) - if resTmp == nil { - return graphql.Null - } - res := resTmp.(*time.Time) - rctx.Result = res - - if res == nil { - return graphql.Null - } - return models.MarshalTime(*res) -} - // nolint: vetshadow func (ec *executionContext) _BertyEntityContactPayload_sigchain(ctx context.Context, field graphql.CollectedField, obj *entity.Contact) graphql.Marshaler { rctx := &graphql.ResolverContext{ @@ -5982,8 +5752,6 @@ func (ec *executionContext) _BertyEntityConversation(ctx context.Context, sel as out.Values[i] = ec._BertyEntityConversation_createdAt(ctx, field, obj) case "updatedAt": out.Values[i] = ec._BertyEntityConversation_updatedAt(ctx, field, obj) - case "deletedAt": - out.Values[i] = ec._BertyEntityConversation_deletedAt(ctx, field, obj) case "title": out.Values[i] = ec._BertyEntityConversation_title(ctx, field, obj) if out.Values[i] == graphql.Null { @@ -6070,30 +5838,6 @@ func (ec *executionContext) _BertyEntityConversation_updatedAt(ctx context.Conte return models.MarshalTime(res) } -// nolint: vetshadow -func (ec *executionContext) _BertyEntityConversation_deletedAt(ctx context.Context, field graphql.CollectedField, obj *entity.Conversation) graphql.Marshaler { - rctx := &graphql.ResolverContext{ - Object: "BertyEntityConversation", - Args: nil, - Field: field, - } - ctx = graphql.WithResolverContext(ctx, rctx) - resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) { - ctx = rctx // use context from middleware stack in children - return obj.DeletedAt, nil - }) - if resTmp == nil { - return graphql.Null - } - res := resTmp.(*time.Time) - rctx.Result = res - - if res == nil { - return graphql.Null - } - return models.MarshalTime(*res) -} - // nolint: vetshadow func (ec *executionContext) _BertyEntityConversation_title(ctx context.Context, field graphql.CollectedField, obj *entity.Conversation) graphql.Marshaler { rctx := &graphql.ResolverContext{ @@ -6225,8 +5969,6 @@ func (ec *executionContext) _BertyEntityConversationMember(ctx context.Context, out.Values[i] = ec._BertyEntityConversationMember_createdAt(ctx, field, obj) case "updatedAt": out.Values[i] = ec._BertyEntityConversationMember_updatedAt(ctx, field, obj) - case "deletedAt": - out.Values[i] = ec._BertyEntityConversationMember_deletedAt(ctx, field, obj) case "status": out.Values[i] = ec._BertyEntityConversationMember_status(ctx, field, obj) case "contact": @@ -6315,30 +6057,6 @@ func (ec *executionContext) _BertyEntityConversationMember_updatedAt(ctx context return models.MarshalTime(res) } -// nolint: vetshadow -func (ec *executionContext) _BertyEntityConversationMember_deletedAt(ctx context.Context, field graphql.CollectedField, obj *entity.ConversationMember) graphql.Marshaler { - rctx := &graphql.ResolverContext{ - Object: "BertyEntityConversationMember", - Args: nil, - Field: field, - } - ctx = graphql.WithResolverContext(ctx, rctx) - resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) { - ctx = rctx // use context from middleware stack in children - return obj.DeletedAt, nil - }) - if resTmp == nil { - return graphql.Null - } - res := resTmp.(*time.Time) - rctx.Result = res - - if res == nil { - return graphql.Null - } - return models.MarshalTime(*res) -} - // nolint: vetshadow func (ec *executionContext) _BertyEntityConversationMember_status(ctx context.Context, field graphql.CollectedField, obj *entity.ConversationMember) graphql.Marshaler { rctx := &graphql.ResolverContext{ @@ -6458,8 +6176,6 @@ func (ec *executionContext) _BertyEntityConversationMemberPayload(ctx context.Co out.Values[i] = ec._BertyEntityConversationMemberPayload_createdAt(ctx, field, obj) case "updatedAt": out.Values[i] = ec._BertyEntityConversationMemberPayload_updatedAt(ctx, field, obj) - case "deletedAt": - out.Values[i] = ec._BertyEntityConversationMemberPayload_deletedAt(ctx, field, obj) case "status": out.Values[i] = ec._BertyEntityConversationMemberPayload_status(ctx, field, obj) case "contact": @@ -6548,30 +6264,6 @@ func (ec *executionContext) _BertyEntityConversationMemberPayload_updatedAt(ctx return models.MarshalTime(res) } -// nolint: vetshadow -func (ec *executionContext) _BertyEntityConversationMemberPayload_deletedAt(ctx context.Context, field graphql.CollectedField, obj *entity.ConversationMember) graphql.Marshaler { - rctx := &graphql.ResolverContext{ - Object: "BertyEntityConversationMemberPayload", - Args: nil, - Field: field, - } - ctx = graphql.WithResolverContext(ctx, rctx) - resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) { - ctx = rctx // use context from middleware stack in children - return obj.DeletedAt, nil - }) - if resTmp == nil { - return graphql.Null - } - res := resTmp.(*time.Time) - rctx.Result = res - - if res == nil { - return graphql.Null - } - return models.MarshalTime(*res) -} - // nolint: vetshadow func (ec *executionContext) _BertyEntityConversationMemberPayload_status(ctx context.Context, field graphql.CollectedField, obj *entity.ConversationMember) graphql.Marshaler { rctx := &graphql.ResolverContext{ @@ -6691,8 +6383,6 @@ func (ec *executionContext) _BertyEntityConversationPayload(ctx context.Context, out.Values[i] = ec._BertyEntityConversationPayload_createdAt(ctx, field, obj) case "updatedAt": out.Values[i] = ec._BertyEntityConversationPayload_updatedAt(ctx, field, obj) - case "deletedAt": - out.Values[i] = ec._BertyEntityConversationPayload_deletedAt(ctx, field, obj) case "title": out.Values[i] = ec._BertyEntityConversationPayload_title(ctx, field, obj) if out.Values[i] == graphql.Null { @@ -6779,30 +6469,6 @@ func (ec *executionContext) _BertyEntityConversationPayload_updatedAt(ctx contex return models.MarshalTime(res) } -// nolint: vetshadow -func (ec *executionContext) _BertyEntityConversationPayload_deletedAt(ctx context.Context, field graphql.CollectedField, obj *entity.Conversation) graphql.Marshaler { - rctx := &graphql.ResolverContext{ - Object: "BertyEntityConversationPayload", - Args: nil, - Field: field, - } - ctx = graphql.WithResolverContext(ctx, rctx) - resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) { - ctx = rctx // use context from middleware stack in children - return obj.DeletedAt, nil - }) - if resTmp == nil { - return graphql.Null - } - res := resTmp.(*time.Time) - rctx.Result = res - - if res == nil { - return graphql.Null - } - return models.MarshalTime(*res) -} - // nolint: vetshadow func (ec *executionContext) _BertyEntityConversationPayload_title(ctx context.Context, field graphql.CollectedField, obj *entity.Conversation) graphql.Marshaler { rctx := &graphql.ResolverContext{ @@ -6934,8 +6600,6 @@ func (ec *executionContext) _BertyEntityDevice(ctx context.Context, sel ast.Sele out.Values[i] = ec._BertyEntityDevice_createdAt(ctx, field, obj) case "updatedAt": out.Values[i] = ec._BertyEntityDevice_updatedAt(ctx, field, obj) - case "deletedAt": - out.Values[i] = ec._BertyEntityDevice_deletedAt(ctx, field, obj) case "name": out.Values[i] = ec._BertyEntityDevice_name(ctx, field, obj) if out.Values[i] == graphql.Null { @@ -7027,30 +6691,6 @@ func (ec *executionContext) _BertyEntityDevice_updatedAt(ctx context.Context, fi return models.MarshalTime(res) } -// nolint: vetshadow -func (ec *executionContext) _BertyEntityDevice_deletedAt(ctx context.Context, field graphql.CollectedField, obj *entity.Device) graphql.Marshaler { - rctx := &graphql.ResolverContext{ - Object: "BertyEntityDevice", - Args: nil, - Field: field, - } - ctx = graphql.WithResolverContext(ctx, rctx) - resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) { - ctx = rctx // use context from middleware stack in children - return obj.DeletedAt, nil - }) - if resTmp == nil { - return graphql.Null - } - res := resTmp.(*time.Time) - rctx.Result = res - - if res == nil { - return graphql.Null - } - return models.MarshalTime(*res) -} - // nolint: vetshadow func (ec *executionContext) _BertyEntityDevice_name(ctx context.Context, field graphql.CollectedField, obj *entity.Device) graphql.Marshaler { rctx := &graphql.ResolverContext{ @@ -7216,8 +6856,6 @@ func (ec *executionContext) _BertyEntitySenderAlias(ctx context.Context, sel ast out.Values[i] = ec._BertyEntitySenderAlias_createdAt(ctx, field, obj) case "updatedAt": out.Values[i] = ec._BertyEntitySenderAlias_updatedAt(ctx, field, obj) - case "deletedAt": - out.Values[i] = ec._BertyEntitySenderAlias_deletedAt(ctx, field, obj) case "status": out.Values[i] = ec._BertyEntitySenderAlias_status(ctx, field, obj) case "originDeviceId": @@ -7319,30 +6957,6 @@ func (ec *executionContext) _BertyEntitySenderAlias_updatedAt(ctx context.Contex return models.MarshalTime(res) } -// nolint: vetshadow -func (ec *executionContext) _BertyEntitySenderAlias_deletedAt(ctx context.Context, field graphql.CollectedField, obj *entity.SenderAlias) graphql.Marshaler { - rctx := &graphql.ResolverContext{ - Object: "BertyEntitySenderAlias", - Args: nil, - Field: field, - } - ctx = graphql.WithResolverContext(ctx, rctx) - resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) { - ctx = rctx // use context from middleware stack in children - return obj.DeletedAt, nil - }) - if resTmp == nil { - return graphql.Null - } - res := resTmp.(*time.Time) - rctx.Result = res - - if res == nil { - return graphql.Null - } - return models.MarshalTime(*res) -} - // nolint: vetshadow func (ec *executionContext) _BertyEntitySenderAlias_status(ctx context.Context, field graphql.CollectedField, obj *entity.SenderAlias) graphql.Marshaler { rctx := &graphql.ResolverContext{ @@ -10188,8 +9802,6 @@ func (ec *executionContext) _BertyP2pEvent(ctx context.Context, sel ast.Selectio out.Values[i] = ec._BertyP2pEvent_createdAt(ctx, field, obj) case "updatedAt": out.Values[i] = ec._BertyP2pEvent_updatedAt(ctx, field, obj) - case "deletedAt": - out.Values[i] = ec._BertyP2pEvent_deletedAt(ctx, field, obj) case "sentAt": out.Values[i] = ec._BertyP2pEvent_sentAt(ctx, field, obj) case "receivedAt": @@ -10327,30 +9939,6 @@ func (ec *executionContext) _BertyP2pEvent_updatedAt(ctx context.Context, field return models.MarshalTime(res) } -// nolint: vetshadow -func (ec *executionContext) _BertyP2pEvent_deletedAt(ctx context.Context, field graphql.CollectedField, obj *p2p.Event) graphql.Marshaler { - rctx := &graphql.ResolverContext{ - Object: "BertyP2pEvent", - Args: nil, - Field: field, - } - ctx = graphql.WithResolverContext(ctx, rctx) - resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) { - ctx = rctx // use context from middleware stack in children - return obj.DeletedAt, nil - }) - if resTmp == nil { - return graphql.Null - } - res := resTmp.(*time.Time) - rctx.Result = res - - if res == nil { - return graphql.Null - } - return models.MarshalTime(*res) -} - // nolint: vetshadow func (ec *executionContext) _BertyP2pEvent_sentAt(ctx context.Context, field graphql.CollectedField, obj *p2p.Event) graphql.Marshaler { rctx := &graphql.ResolverContext{ @@ -10617,8 +10205,6 @@ func (ec *executionContext) _BertyP2pEventPayload(ctx context.Context, sel ast.S out.Values[i] = ec._BertyP2pEventPayload_createdAt(ctx, field, obj) case "updatedAt": out.Values[i] = ec._BertyP2pEventPayload_updatedAt(ctx, field, obj) - case "deletedAt": - out.Values[i] = ec._BertyP2pEventPayload_deletedAt(ctx, field, obj) case "sentAt": out.Values[i] = ec._BertyP2pEventPayload_sentAt(ctx, field, obj) case "receivedAt": @@ -10756,30 +10342,6 @@ func (ec *executionContext) _BertyP2pEventPayload_updatedAt(ctx context.Context, return models.MarshalTime(res) } -// nolint: vetshadow -func (ec *executionContext) _BertyP2pEventPayload_deletedAt(ctx context.Context, field graphql.CollectedField, obj *p2p.Event) graphql.Marshaler { - rctx := &graphql.ResolverContext{ - Object: "BertyP2pEventPayload", - Args: nil, - Field: field, - } - ctx = graphql.WithResolverContext(ctx, rctx) - resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) { - ctx = rctx // use context from middleware stack in children - return obj.DeletedAt, nil - }) - if resTmp == nil { - return graphql.Null - } - res := resTmp.(*time.Time) - rctx.Result = res - - if res == nil { - return graphql.Null - } - return models.MarshalTime(*res) -} - // nolint: vetshadow func (ec *executionContext) _BertyP2pEventPayload_sentAt(ctx context.Context, field graphql.CollectedField, obj *p2p.Event) graphql.Marshaler { rctx := &graphql.ResolverContext{ @@ -17530,7 +17092,7 @@ func (ec *executionContext) _Mutation_ContactAcceptRequest(ctx context.Context, ctx = graphql.WithResolverContext(ctx, rctx) resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) { ctx = rctx // use context from middleware stack in children - return ec.resolvers.Mutation().ContactAcceptRequest(rctx, args["id"].(string), args["createdAt"].(*time.Time), args["updatedAt"].(*time.Time), args["deletedAt"].(*time.Time), args["sigchain"].([]byte), args["status"].(*int32), args["devices"].([]*entity.Device), args["displayName"].(string), args["displayStatus"].(string), args["overrideDisplayName"].(string), args["overrideDisplayStatus"].(string)) + return ec.resolvers.Mutation().ContactAcceptRequest(rctx, args["id"].(string), args["createdAt"].(*time.Time), args["updatedAt"].(*time.Time), args["sigchain"].([]byte), args["status"].(*int32), args["devices"].([]*entity.Device), args["displayName"].(string), args["displayStatus"].(string), args["overrideDisplayName"].(string), args["overrideDisplayStatus"].(string)) }) if resTmp == nil { return graphql.Null @@ -17561,7 +17123,7 @@ func (ec *executionContext) _Mutation_ContactRemove(ctx context.Context, field g ctx = graphql.WithResolverContext(ctx, rctx) resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) { ctx = rctx // use context from middleware stack in children - return ec.resolvers.Mutation().ContactRemove(rctx, args["id"].(string), args["createdAt"].(*time.Time), args["updatedAt"].(*time.Time), args["deletedAt"].(*time.Time), args["sigchain"].([]byte), args["status"].(*int32), args["devices"].([]*entity.Device), args["displayName"].(string), args["displayStatus"].(string), args["overrideDisplayName"].(string), args["overrideDisplayStatus"].(string)) + return ec.resolvers.Mutation().ContactRemove(rctx, args["id"].(string), args["createdAt"].(*time.Time), args["updatedAt"].(*time.Time), args["sigchain"].([]byte), args["status"].(*int32), args["devices"].([]*entity.Device), args["displayName"].(string), args["displayStatus"].(string), args["overrideDisplayName"].(string), args["overrideDisplayStatus"].(string)) }) if resTmp == nil { return graphql.Null @@ -17592,7 +17154,7 @@ func (ec *executionContext) _Mutation_ContactUpdate(ctx context.Context, field g ctx = graphql.WithResolverContext(ctx, rctx) resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) { ctx = rctx // use context from middleware stack in children - return ec.resolvers.Mutation().ContactUpdate(rctx, args["id"].(string), args["createdAt"].(*time.Time), args["updatedAt"].(*time.Time), args["deletedAt"].(*time.Time), args["sigchain"].([]byte), args["status"].(*int32), args["devices"].([]*entity.Device), args["displayName"].(string), args["displayStatus"].(string), args["overrideDisplayName"].(string), args["overrideDisplayStatus"].(string)) + return ec.resolvers.Mutation().ContactUpdate(rctx, args["id"].(string), args["createdAt"].(*time.Time), args["updatedAt"].(*time.Time), args["sigchain"].([]byte), args["status"].(*int32), args["devices"].([]*entity.Device), args["displayName"].(string), args["displayStatus"].(string), args["overrideDisplayName"].(string), args["overrideDisplayStatus"].(string)) }) if resTmp == nil { return graphql.Null @@ -18078,7 +17640,7 @@ func (ec *executionContext) _Query_GetEvent(ctx context.Context, field graphql.C ctx = graphql.WithResolverContext(ctx, rctx) resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) { ctx = rctx // use context from middleware stack in children - return ec.resolvers.Query().GetEvent(rctx, args["id"].(string), args["senderId"].(string), args["createdAt"].(*time.Time), args["updatedAt"].(*time.Time), args["deletedAt"].(*time.Time), args["sentAt"].(*time.Time), args["receivedAt"].(*time.Time), args["ackedAt"].(*time.Time), args["direction"].(*int32), args["senderApiVersion"].(uint32), args["receiverApiVersion"].(uint32), args["receiverId"].(string), args["kind"].(*int32), args["attributes"].([]byte), args["conversationId"].(string)) + return ec.resolvers.Query().GetEvent(rctx, args["id"].(string), args["senderId"].(string), args["createdAt"].(*time.Time), args["updatedAt"].(*time.Time), args["sentAt"].(*time.Time), args["receivedAt"].(*time.Time), args["ackedAt"].(*time.Time), args["direction"].(*int32), args["senderApiVersion"].(uint32), args["receiverApiVersion"].(uint32), args["receiverId"].(string), args["kind"].(*int32), args["attributes"].([]byte), args["conversationId"].(string)) }) if resTmp == nil { return graphql.Null @@ -18140,7 +17702,7 @@ func (ec *executionContext) _Query_GetContact(ctx context.Context, field graphql ctx = graphql.WithResolverContext(ctx, rctx) resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) { ctx = rctx // use context from middleware stack in children - return ec.resolvers.Query().GetContact(rctx, args["id"].(string), args["createdAt"].(*time.Time), args["updatedAt"].(*time.Time), args["deletedAt"].(*time.Time), args["sigchain"].([]byte), args["status"].(*int32), args["devices"].([]*entity.Device), args["displayName"].(string), args["displayStatus"].(string), args["overrideDisplayName"].(string), args["overrideDisplayStatus"].(string)) + return ec.resolvers.Query().GetContact(rctx, args["id"].(string), args["createdAt"].(*time.Time), args["updatedAt"].(*time.Time), args["sigchain"].([]byte), args["status"].(*int32), args["devices"].([]*entity.Device), args["displayName"].(string), args["displayStatus"].(string), args["overrideDisplayName"].(string), args["overrideDisplayStatus"].(string)) }) if resTmp == nil { return graphql.Null @@ -18202,7 +17764,7 @@ func (ec *executionContext) _Query_GetConversation(ctx context.Context, field gr ctx = graphql.WithResolverContext(ctx, rctx) resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) { ctx = rctx // use context from middleware stack in children - return ec.resolvers.Query().GetConversation(rctx, args["id"].(string), args["createdAt"].(*time.Time), args["updatedAt"].(*time.Time), args["deletedAt"].(*time.Time), args["title"].(string), args["topic"].(string), args["members"].([]*entity.ConversationMember)) + return ec.resolvers.Query().GetConversation(rctx, args["id"].(string), args["createdAt"].(*time.Time), args["updatedAt"].(*time.Time), args["title"].(string), args["topic"].(string), args["members"].([]*entity.ConversationMember)) }) if resTmp == nil { return graphql.Null @@ -18233,7 +17795,7 @@ func (ec *executionContext) _Query_GetConversationMember(ctx context.Context, fi ctx = graphql.WithResolverContext(ctx, rctx) resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) { ctx = rctx // use context from middleware stack in children - return ec.resolvers.Query().GetConversationMember(rctx, args["id"].(string), args["createdAt"].(*time.Time), args["updatedAt"].(*time.Time), args["deletedAt"].(*time.Time), args["status"].(*int32), args["contact"].(*entity.Contact), args["conversationId"].(string), args["contactId"].(string)) + return ec.resolvers.Query().GetConversationMember(rctx, args["id"].(string), args["createdAt"].(*time.Time), args["updatedAt"].(*time.Time), args["status"].(*int32), args["contact"].(*entity.Contact), args["conversationId"].(string), args["contactId"].(string)) }) if resTmp == nil { return graphql.Null @@ -19977,17 +19539,6 @@ func UnmarshalBertyEntityContactInput(v interface{}) (entity.Contact, error) { case "updatedAt": var err error it.UpdatedAt, err = models.UnmarshalTime(v) - if err != nil { - return it, err - } - case "deletedAt": - var err error - var ptr1 time.Time - if v != nil { - ptr1, err = models.UnmarshalTime(v) - it.DeletedAt = &ptr1 - } - if err != nil { return it, err } @@ -20089,17 +19640,6 @@ func UnmarshalBertyEntityConversationInput(v interface{}) (entity.Conversation, case "updatedAt": var err error it.UpdatedAt, err = models.UnmarshalTime(v) - if err != nil { - return it, err - } - case "deletedAt": - var err error - var ptr1 time.Time - if v != nil { - ptr1, err = models.UnmarshalTime(v) - it.DeletedAt = &ptr1 - } - if err != nil { return it, err } @@ -20163,17 +19703,6 @@ func UnmarshalBertyEntityConversationMemberInput(v interface{}) (entity.Conversa case "updatedAt": var err error it.UpdatedAt, err = models.UnmarshalTime(v) - if err != nil { - return it, err - } - case "deletedAt": - var err error - var ptr1 time.Time - if v != nil { - ptr1, err = models.UnmarshalTime(v) - it.DeletedAt = &ptr1 - } - if err != nil { return it, err } @@ -20236,17 +19765,6 @@ func UnmarshalBertyEntityDeviceInput(v interface{}) (entity.Device, error) { case "updatedAt": var err error it.UpdatedAt, err = models.UnmarshalTime(v) - if err != nil { - return it, err - } - case "deletedAt": - var err error - var ptr1 time.Time - if v != nil { - ptr1, err = models.UnmarshalTime(v) - it.DeletedAt = &ptr1 - } - if err != nil { return it, err } @@ -20376,17 +19894,6 @@ func UnmarshalBertyP2pEventInput(v interface{}) (p2p.Event, error) { case "updatedAt": var err error it.UpdatedAt, err = models.UnmarshalTime(v) - if err != nil { - return it, err - } - case "deletedAt": - var err error - var ptr1 time.Time - if v != nil { - ptr1, err = models.UnmarshalTime(v) - it.DeletedAt = &ptr1 - } - if err != nil { return it, err } @@ -20769,7 +20276,6 @@ type BertyEntityDevice implements Node { id: ID! createdAt: GoogleProtobufTimestamp updatedAt: GoogleProtobufTimestamp - deletedAt: GoogleProtobufTimestamp name: String! status: Enum apiVersion: Uint32! @@ -20784,7 +20290,6 @@ type BertyEntityContact implements Node { id: ID! createdAt: GoogleProtobufTimestamp updatedAt: GoogleProtobufTimestamp - deletedAt: GoogleProtobufTimestamp sigchain: [Byte!], status: Enum devices: [BertyEntityDevice] @@ -20801,7 +20306,6 @@ type BertyEntityConversation implements Node { id: ID! createdAt: GoogleProtobufTimestamp updatedAt: GoogleProtobufTimestamp - deletedAt: GoogleProtobufTimestamp title: String! topic: String! members: [BertyEntityConversationMember] @@ -20811,7 +20315,6 @@ type BertyEntityConversationMember implements Node { id: ID! createdAt: GoogleProtobufTimestamp updatedAt: GoogleProtobufTimestamp - deletedAt: GoogleProtobufTimestamp status: Enum contact: BertyEntityContact conversationId: String! @@ -20833,7 +20336,6 @@ type BertyEntitySenderAlias { id: String! createdAt: GoogleProtobufTimestamp updatedAt: GoogleProtobufTimestamp - deletedAt: GoogleProtobufTimestamp status: Enum originDeviceId: String! contactId: String! @@ -20896,7 +20398,6 @@ type BertyP2pEvent implements Node { senderId: String! createdAt: GoogleProtobufTimestamp updatedAt: GoogleProtobufTimestamp - deletedAt: GoogleProtobufTimestamp sentAt: GoogleProtobufTimestamp receivedAt: GoogleProtobufTimestamp ackedAt: GoogleProtobufTimestamp @@ -21012,7 +20513,6 @@ input BertyP2pEventInput { senderId: String! createdAt: GoogleProtobufTimestampInput updatedAt: GoogleProtobufTimestampInput - deletedAt: GoogleProtobufTimestampInput sentAt: GoogleProtobufTimestampInput receivedAt: GoogleProtobufTimestampInput ackedAt: GoogleProtobufTimestampInput @@ -21029,7 +20529,6 @@ type BertyP2pEventPayload { senderId: String! createdAt: GoogleProtobufTimestamp updatedAt: GoogleProtobufTimestamp - deletedAt: GoogleProtobufTimestamp sentAt: GoogleProtobufTimestamp receivedAt: GoogleProtobufTimestamp ackedAt: GoogleProtobufTimestamp @@ -21053,7 +20552,6 @@ input BertyEntityDeviceInput { id: ID! createdAt: GoogleProtobufTimestampInput updatedAt: GoogleProtobufTimestampInput - deletedAt: GoogleProtobufTimestampInput name: String! status: Enum apiVersion: Uint32! @@ -21063,7 +20561,6 @@ input BertyEntityContactInput { id: ID! createdAt: GoogleProtobufTimestampInput updatedAt: GoogleProtobufTimestampInput - deletedAt: GoogleProtobufTimestampInput sigchain: [Byte!], status: Enum devices: [BertyEntityDeviceInput] @@ -21076,7 +20573,6 @@ type BertyEntityContactPayload { id: ID! createdAt: GoogleProtobufTimestamp updatedAt: GoogleProtobufTimestamp - deletedAt: GoogleProtobufTimestamp sigchain: [Byte!], status: Enum devices: [BertyEntityDevice] @@ -21089,7 +20585,6 @@ type BertyEntityConversationPayload { id: ID! createdAt: GoogleProtobufTimestamp updatedAt: GoogleProtobufTimestamp - deletedAt: GoogleProtobufTimestamp title: String! topic: String! members: [BertyEntityConversationMember] @@ -21098,7 +20593,6 @@ input BertyEntityConversationMemberInput { id: ID! createdAt: GoogleProtobufTimestampInput updatedAt: GoogleProtobufTimestampInput - deletedAt: GoogleProtobufTimestampInput status: Enum contact: BertyEntityContactInput conversationId: String! @@ -21108,7 +20602,6 @@ input BertyEntityConversationInput { id: ID! createdAt: GoogleProtobufTimestampInput updatedAt: GoogleProtobufTimestampInput - deletedAt: GoogleProtobufTimestampInput title: String! topic: String! members: [BertyEntityConversationMemberInput] @@ -21120,7 +20613,6 @@ type BertyEntityConversationMemberPayload { id: ID! createdAt: GoogleProtobufTimestamp updatedAt: GoogleProtobufTimestamp - deletedAt: GoogleProtobufTimestamp status: Enum contact: BertyEntityContact conversationId: String! @@ -21180,7 +20672,6 @@ type Query { senderId: String! createdAt: GoogleProtobufTimestampInput updatedAt: GoogleProtobufTimestampInput - deletedAt: GoogleProtobufTimestampInput sentAt: GoogleProtobufTimestampInput receivedAt: GoogleProtobufTimestampInput ackedAt: GoogleProtobufTimestampInput @@ -21205,7 +20696,6 @@ type Query { id: ID! createdAt: GoogleProtobufTimestampInput updatedAt: GoogleProtobufTimestampInput - deletedAt: GoogleProtobufTimestampInput sigchain: [Byte!], status: Enum devices: [BertyEntityDeviceInput] @@ -21227,7 +20717,6 @@ type Query { id: ID! createdAt: GoogleProtobufTimestampInput updatedAt: GoogleProtobufTimestampInput - deletedAt: GoogleProtobufTimestampInput title: String! topic: String! members: [BertyEntityConversationMemberInput] @@ -21236,7 +20725,6 @@ type Query { id: ID! createdAt: GoogleProtobufTimestampInput updatedAt: GoogleProtobufTimestampInput - deletedAt: GoogleProtobufTimestampInput status: Enum contact: BertyEntityContactInput conversationId: String! @@ -21270,7 +20758,6 @@ type Mutation { id: ID! createdAt: GoogleProtobufTimestampInput updatedAt: GoogleProtobufTimestampInput - deletedAt: GoogleProtobufTimestampInput sigchain: [Byte!], status: Enum devices: [BertyEntityDeviceInput] @@ -21283,7 +20770,6 @@ type Mutation { id: ID! createdAt: GoogleProtobufTimestampInput updatedAt: GoogleProtobufTimestampInput - deletedAt: GoogleProtobufTimestampInput sigchain: [Byte!], status: Enum devices: [BertyEntityDeviceInput] @@ -21296,7 +20782,6 @@ type Mutation { id: ID! createdAt: GoogleProtobufTimestampInput updatedAt: GoogleProtobufTimestampInput - deletedAt: GoogleProtobufTimestampInput sigchain: [Byte!], status: Enum devices: [BertyEntityDeviceInput] diff --git a/core/api/node/graphql/resolver.go b/core/api/node/graphql/resolver.go index 56757b3b8c..2b1b183d77 100644 --- a/core/api/node/graphql/resolver.go +++ b/core/api/node/graphql/resolver.go @@ -189,17 +189,17 @@ func (r *mutationResolver) ContactRequest(ctx context.Context, contact *entity.C IntroText: introText, }) } -func (r *mutationResolver) ContactAcceptRequest(ctx context.Context, id string, createdAt *time.Time, updatedAt *time.Time, deletedAt *time.Time, sigchain []byte, status *int32, devices []*entity.Device, displayName string, displayStatus string, overrideDisplayName string, overrideDisplayStatus string) (*entity.Contact, error) { +func (r *mutationResolver) ContactAcceptRequest(ctx context.Context, id string, createdAt *time.Time, updatedAt *time.Time, sigchain []byte, status *int32, devices []*entity.Device, displayName string, displayStatus string, overrideDisplayName string, overrideDisplayStatus string) (*entity.Contact, error) { return r.client.ContactAcceptRequest(ctx, &entity.Contact{ ID: strings.SplitN(id, ":", 2)[1], }) } -func (r *mutationResolver) ContactRemove(ctx context.Context, id string, createdAt *time.Time, updatedAt *time.Time, deletedAt *time.Time, sigchain []byte, status *int32, devices []*entity.Device, displayName string, displayStatus string, overrideDisplayName string, overrideDisplayStatus string) (*entity.Contact, error) { +func (r *mutationResolver) ContactRemove(ctx context.Context, id string, createdAt *time.Time, updatedAt *time.Time, sigchain []byte, status *int32, devices []*entity.Device, displayName string, displayStatus string, overrideDisplayName string, overrideDisplayStatus string) (*entity.Contact, error) { return r.client.ContactRemove(ctx, &entity.Contact{ ID: strings.SplitN(id, ":", 2)[1], }) } -func (r *mutationResolver) ContactUpdate(ctx context.Context, id string, createdAt *time.Time, updatedAt *time.Time, deletedAt *time.Time, sigchain []byte, status *int32, devices []*entity.Device, displayName string, displayStatus string, overrideDisplayName string, overrideDisplayStatus string) (*entity.Contact, error) { +func (r *mutationResolver) ContactUpdate(ctx context.Context, id string, createdAt *time.Time, updatedAt *time.Time, sigchain []byte, status *int32, devices []*entity.Device, displayName string, displayStatus string, overrideDisplayName string, overrideDisplayStatus string) (*entity.Contact, error) { return r.client.ContactUpdate(ctx, &entity.Contact{ ID: strings.SplitN(id, ":", 2)[1], }) @@ -357,7 +357,7 @@ func (r *queryResolver) EventList(ctx context.Context, filter *p2p.Event, rawOnl return output, nil } -func (r *queryResolver) GetEvent(ctx context.Context, id string, senderID string, createdAt *time.Time, updatedAt *time.Time, deletedAt *time.Time, sentAt *time.Time, receivedAt *time.Time, ackedAt *time.Time, direction *int32, senderAPIVersion uint32, receiverAPIVersion uint32, receiverID string, kind *int32, attributes []byte, conversationID string) (*p2p.Event, error) { +func (r *queryResolver) GetEvent(ctx context.Context, id string, senderID string, createdAt *time.Time, updatedAt *time.Time, sentAt *time.Time, receivedAt *time.Time, ackedAt *time.Time, direction *int32, senderAPIVersion uint32, receiverAPIVersion uint32, receiverID string, kind *int32, attributes []byte, conversationID string) (*p2p.Event, error) { return r.client.GetEvent(ctx, &p2p.Event{ ID: strings.SplitN(id, ":", 2)[1], }) @@ -431,7 +431,7 @@ func (r *queryResolver) ContactList(ctx context.Context, filter *entity.Contact, output.PageInfo.HasNextPage = hasNextPage return output, nil } -func (r *queryResolver) GetContact(ctx context.Context, id string, createdAt *time.Time, updatedAt *time.Time, deletedAt *time.Time, sigchain []byte, status *int32, devices []*entity.Device, displayName string, displayStatus string, overrideDisplayName string, overrideDisplayStatus string) (*entity.Contact, error) { +func (r *queryResolver) GetContact(ctx context.Context, id string, createdAt *time.Time, updatedAt *time.Time, sigchain []byte, status *int32, devices []*entity.Device, displayName string, displayStatus string, overrideDisplayName string, overrideDisplayStatus string) (*entity.Contact, error) { return r.client.GetContact(ctx, &entity.Contact{ID: id}) } func (r *queryResolver) ConversationList(ctx context.Context, filter *entity.Conversation, orderBy string, orderDesc bool, first *int32, after *string, last *int32, before *string) (*node.ConversationListConnection, error) { @@ -502,10 +502,10 @@ func (r *queryResolver) ConversationList(ctx context.Context, filter *entity.Con output.PageInfo.HasNextPage = hasNextPage return output, nil } -func (r *queryResolver) GetConversation(ctx context.Context, id string, createdAt *time.Time, updatedAt *time.Time, deletedAt *time.Time, title string, topic string, members []*entity.ConversationMember) (*entity.Conversation, error) { +func (r *queryResolver) GetConversation(ctx context.Context, id string, createdAt *time.Time, updatedAt *time.Time, title string, topic string, members []*entity.ConversationMember) (*entity.Conversation, error) { return r.client.GetConversation(ctx, &entity.Conversation{ID: id}) } -func (r *queryResolver) GetConversationMember(ctx context.Context, id string, createdAt *time.Time, updatedAt *time.Time, deletedAt *time.Time, status *int32, contact *entity.Contact, conversationID string, contactID string) (*entity.ConversationMember, error) { +func (r *queryResolver) GetConversationMember(ctx context.Context, id string, createdAt *time.Time, updatedAt *time.Time, status *int32, contact *entity.Contact, conversationID string, contactID string) (*entity.ConversationMember, error) { return r.client.GetConversationMember(ctx, &entity.ConversationMember{ID: id}) } func (r *queryResolver) DeviceInfos(ctx context.Context, T bool) (*deviceinfo.DeviceInfos, error) { diff --git a/core/api/node/graphql/service.gen.graphql b/core/api/node/graphql/service.gen.graphql index cbec7acf5b..460fb8a422 100644 --- a/core/api/node/graphql/service.gen.graphql +++ b/core/api/node/graphql/service.gen.graphql @@ -255,7 +255,6 @@ type BertyEntityDevice implements Node { id: ID! createdAt: GoogleProtobufTimestamp updatedAt: GoogleProtobufTimestamp - deletedAt: GoogleProtobufTimestamp name: String! status: Enum apiVersion: Uint32! @@ -270,7 +269,6 @@ type BertyEntityContact implements Node { id: ID! createdAt: GoogleProtobufTimestamp updatedAt: GoogleProtobufTimestamp - deletedAt: GoogleProtobufTimestamp sigchain: [Byte!], status: Enum devices: [BertyEntityDevice] @@ -287,7 +285,6 @@ type BertyEntityConversation implements Node { id: ID! createdAt: GoogleProtobufTimestamp updatedAt: GoogleProtobufTimestamp - deletedAt: GoogleProtobufTimestamp title: String! topic: String! members: [BertyEntityConversationMember] @@ -297,7 +294,6 @@ type BertyEntityConversationMember implements Node { id: ID! createdAt: GoogleProtobufTimestamp updatedAt: GoogleProtobufTimestamp - deletedAt: GoogleProtobufTimestamp status: Enum contact: BertyEntityContact conversationId: String! @@ -319,7 +315,6 @@ type BertyEntitySenderAlias { id: String! createdAt: GoogleProtobufTimestamp updatedAt: GoogleProtobufTimestamp - deletedAt: GoogleProtobufTimestamp status: Enum originDeviceId: String! contactId: String! @@ -382,7 +377,6 @@ type BertyP2pEvent implements Node { senderId: String! createdAt: GoogleProtobufTimestamp updatedAt: GoogleProtobufTimestamp - deletedAt: GoogleProtobufTimestamp sentAt: GoogleProtobufTimestamp receivedAt: GoogleProtobufTimestamp ackedAt: GoogleProtobufTimestamp @@ -498,7 +492,6 @@ input BertyP2pEventInput { senderId: String! createdAt: GoogleProtobufTimestampInput updatedAt: GoogleProtobufTimestampInput - deletedAt: GoogleProtobufTimestampInput sentAt: GoogleProtobufTimestampInput receivedAt: GoogleProtobufTimestampInput ackedAt: GoogleProtobufTimestampInput @@ -515,7 +508,6 @@ type BertyP2pEventPayload { senderId: String! createdAt: GoogleProtobufTimestamp updatedAt: GoogleProtobufTimestamp - deletedAt: GoogleProtobufTimestamp sentAt: GoogleProtobufTimestamp receivedAt: GoogleProtobufTimestamp ackedAt: GoogleProtobufTimestamp @@ -539,7 +531,6 @@ input BertyEntityDeviceInput { id: ID! createdAt: GoogleProtobufTimestampInput updatedAt: GoogleProtobufTimestampInput - deletedAt: GoogleProtobufTimestampInput name: String! status: Enum apiVersion: Uint32! @@ -549,7 +540,6 @@ input BertyEntityContactInput { id: ID! createdAt: GoogleProtobufTimestampInput updatedAt: GoogleProtobufTimestampInput - deletedAt: GoogleProtobufTimestampInput sigchain: [Byte!], status: Enum devices: [BertyEntityDeviceInput] @@ -562,7 +552,6 @@ type BertyEntityContactPayload { id: ID! createdAt: GoogleProtobufTimestamp updatedAt: GoogleProtobufTimestamp - deletedAt: GoogleProtobufTimestamp sigchain: [Byte!], status: Enum devices: [BertyEntityDevice] @@ -575,7 +564,6 @@ type BertyEntityConversationPayload { id: ID! createdAt: GoogleProtobufTimestamp updatedAt: GoogleProtobufTimestamp - deletedAt: GoogleProtobufTimestamp title: String! topic: String! members: [BertyEntityConversationMember] @@ -584,7 +572,6 @@ input BertyEntityConversationMemberInput { id: ID! createdAt: GoogleProtobufTimestampInput updatedAt: GoogleProtobufTimestampInput - deletedAt: GoogleProtobufTimestampInput status: Enum contact: BertyEntityContactInput conversationId: String! @@ -594,7 +581,6 @@ input BertyEntityConversationInput { id: ID! createdAt: GoogleProtobufTimestampInput updatedAt: GoogleProtobufTimestampInput - deletedAt: GoogleProtobufTimestampInput title: String! topic: String! members: [BertyEntityConversationMemberInput] @@ -606,7 +592,6 @@ type BertyEntityConversationMemberPayload { id: ID! createdAt: GoogleProtobufTimestamp updatedAt: GoogleProtobufTimestamp - deletedAt: GoogleProtobufTimestamp status: Enum contact: BertyEntityContact conversationId: String! @@ -666,7 +651,6 @@ type Query { senderId: String! createdAt: GoogleProtobufTimestampInput updatedAt: GoogleProtobufTimestampInput - deletedAt: GoogleProtobufTimestampInput sentAt: GoogleProtobufTimestampInput receivedAt: GoogleProtobufTimestampInput ackedAt: GoogleProtobufTimestampInput @@ -691,7 +675,6 @@ type Query { id: ID! createdAt: GoogleProtobufTimestampInput updatedAt: GoogleProtobufTimestampInput - deletedAt: GoogleProtobufTimestampInput sigchain: [Byte!], status: Enum devices: [BertyEntityDeviceInput] @@ -713,7 +696,6 @@ type Query { id: ID! createdAt: GoogleProtobufTimestampInput updatedAt: GoogleProtobufTimestampInput - deletedAt: GoogleProtobufTimestampInput title: String! topic: String! members: [BertyEntityConversationMemberInput] @@ -722,7 +704,6 @@ type Query { id: ID! createdAt: GoogleProtobufTimestampInput updatedAt: GoogleProtobufTimestampInput - deletedAt: GoogleProtobufTimestampInput status: Enum contact: BertyEntityContactInput conversationId: String! @@ -756,7 +737,6 @@ type Mutation { id: ID! createdAt: GoogleProtobufTimestampInput updatedAt: GoogleProtobufTimestampInput - deletedAt: GoogleProtobufTimestampInput sigchain: [Byte!], status: Enum devices: [BertyEntityDeviceInput] @@ -769,7 +749,6 @@ type Mutation { id: ID! createdAt: GoogleProtobufTimestampInput updatedAt: GoogleProtobufTimestampInput - deletedAt: GoogleProtobufTimestampInput sigchain: [Byte!], status: Enum devices: [BertyEntityDeviceInput] @@ -782,7 +761,6 @@ type Mutation { id: ID! createdAt: GoogleProtobufTimestampInput updatedAt: GoogleProtobufTimestampInput - deletedAt: GoogleProtobufTimestampInput sigchain: [Byte!], status: Enum devices: [BertyEntityDeviceInput] diff --git a/core/api/p2p/event.go b/core/api/p2p/event.go index 4d77746729..e5a17b95eb 100644 --- a/core/api/p2p/event.go +++ b/core/api/p2p/event.go @@ -30,7 +30,6 @@ func (e Event) Copy() *Event { ID: e.ID, CreatedAt: e.CreatedAt, UpdatedAt: e.UpdatedAt, - DeletedAt: e.DeletedAt, SenderID: e.SenderID, Direction: e.Direction, SenderAPIVersion: e.SenderAPIVersion, diff --git a/core/api/p2p/event.pb.go b/core/api/p2p/event.pb.go index e649bb137f..849ced706a 100644 --- a/core/api/p2p/event.pb.go +++ b/core/api/p2p/event.pb.go @@ -60,7 +60,7 @@ func (x Event_Direction) String() string { return proto.EnumName(Event_Direction_name, int32(x)) } func (Event_Direction) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_event_b56c09884060a6c1, []int{0, 0} + return fileDescriptor_event_cd5100104215cb1d, []int{0, 0} } type Event struct { @@ -76,8 +76,6 @@ type Event struct { // UpdatedAt is set to current date each time the object is updated in database. // This field is required by gorm. UpdatedAt time.Time `protobuf:"bytes,4,opt,name=updated_at,json=updatedAt,stdtime" json:"updated_at"` - // DeletedAt is not used but required by gorm. - DeletedAt *time.Time `protobuf:"bytes,5,opt,name=deleted_at,json=deletedAt,stdtime" json:"deleted_at,omitempty"` // SentAt is set to current date just after sending the event. SentAt *time.Time `protobuf:"bytes,6,opt,name=sent_at,json=sentAt,stdtime" json:"sent_at,omitempty"` // ReceivedAt is set to current date just after receiving the event. @@ -108,7 +106,7 @@ func (m *Event) Reset() { *m = Event{} } func (m *Event) String() string { return proto.CompactTextString(m) } func (*Event) ProtoMessage() {} func (*Event) Descriptor() ([]byte, []int) { - return fileDescriptor_event_b56c09884060a6c1, []int{0} + return fileDescriptor_event_cd5100104215cb1d, []int{0} } func (m *Event) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -165,13 +163,6 @@ func (m *Event) GetUpdatedAt() time.Time { return time.Time{} } -func (m *Event) GetDeletedAt() *time.Time { - if m != nil { - return m.DeletedAt - } - return nil -} - func (m *Event) GetSentAt() *time.Time { if m != nil { return m.SentAt @@ -289,45 +280,35 @@ func (m *Event) MarshalTo(dAtA []byte) (int, error) { return 0, err } i += n2 - if m.DeletedAt != nil { - dAtA[i] = 0x2a - i++ - i = encodeVarintEvent(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdTime(*m.DeletedAt))) - n3, err := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.DeletedAt, dAtA[i:]) - if err != nil { - return 0, err - } - i += n3 - } if m.SentAt != nil { dAtA[i] = 0x32 i++ i = encodeVarintEvent(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdTime(*m.SentAt))) - n4, err := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.SentAt, dAtA[i:]) + n3, err := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.SentAt, dAtA[i:]) if err != nil { return 0, err } - i += n4 + i += n3 } if m.ReceivedAt != nil { dAtA[i] = 0x3a i++ i = encodeVarintEvent(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdTime(*m.ReceivedAt))) - n5, err := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.ReceivedAt, dAtA[i:]) + n4, err := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.ReceivedAt, dAtA[i:]) if err != nil { return 0, err } - i += n5 + i += n4 } if m.AckedAt != nil { dAtA[i] = 0x42 i++ i = encodeVarintEvent(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdTime(*m.AckedAt))) - n6, err := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.AckedAt, dAtA[i:]) + n5, err := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.AckedAt, dAtA[i:]) if err != nil { return 0, err } - i += n6 + i += n5 } if m.Direction != 0 { dAtA[i] = 0x48 @@ -400,10 +381,6 @@ func (m *Event) Size() (n int) { n += 1 + l + sovEvent(uint64(l)) l = github_com_gogo_protobuf_types.SizeOfStdTime(m.UpdatedAt) n += 1 + l + sovEvent(uint64(l)) - if m.DeletedAt != nil { - l = github_com_gogo_protobuf_types.SizeOfStdTime(*m.DeletedAt) - n += 1 + l + sovEvent(uint64(l)) - } if m.SentAt != nil { l = github_com_gogo_protobuf_types.SizeOfStdTime(*m.SentAt) n += 1 + l + sovEvent(uint64(l)) @@ -606,39 +583,6 @@ func (m *Event) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field DeletedAt", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvent - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthEvent - } - postIndex := iNdEx + msglen - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.DeletedAt == nil { - m.DeletedAt = new(time.Time) - } - if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(m.DeletedAt, dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex case 6: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field SentAt", wireType) @@ -1030,47 +974,46 @@ var ( ErrIntOverflowEvent = fmt.Errorf("proto: integer overflow") ) -func init() { proto.RegisterFile("api/p2p/event.proto", fileDescriptor_event_b56c09884060a6c1) } - -var fileDescriptor_event_b56c09884060a6c1 = []byte{ - // 611 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x94, 0xcd, 0x6e, 0xd3, 0x40, - 0x10, 0xc7, 0xbb, 0x21, 0x6d, 0xec, 0x69, 0x9b, 0x46, 0x4b, 0x54, 0xd2, 0x1c, 0xe2, 0x28, 0x70, - 0x08, 0x17, 0x1b, 0x85, 0x0b, 0x1f, 0x87, 0xca, 0x69, 0x10, 0x58, 0x48, 0x80, 0xcc, 0xc7, 0x81, - 0x4b, 0xe4, 0x78, 0x17, 0x77, 0x95, 0xc6, 0x6b, 0x36, 0x9b, 0xa2, 0xbe, 0x05, 0x47, 0x1e, 0xa9, - 0x27, 0xc4, 0x13, 0x98, 0xca, 0x5c, 0x38, 0x56, 0x3c, 0x01, 0xda, 0xb5, 0x9d, 0x9a, 0x03, 0xa2, - 0x9c, 0xe2, 0x9d, 0x99, 0xdf, 0x7f, 0x67, 0x46, 0xff, 0x0d, 0xdc, 0x0c, 0x12, 0xe6, 0x24, 0xa3, - 0xc4, 0xa1, 0xa7, 0x34, 0x96, 0x76, 0x22, 0xb8, 0xe4, 0xd8, 0x9c, 0x51, 0x21, 0xcf, 0xec, 0x64, - 0x94, 0x74, 0x07, 0x3a, 0xaf, 0xa2, 0xb3, 0xd5, 0x07, 0x27, 0x12, 0x41, 0x72, 0xfc, 0xf1, 0xa4, - 0xfc, 0xcd, 0xcb, 0xbb, 0xb8, 0xd4, 0x98, 0xb3, 0x98, 0x14, 0xb1, 0x76, 0xc4, 0x23, 0xae, 0x3f, - 0x1d, 0xf5, 0x55, 0x44, 0xad, 0x88, 0xf3, 0xe8, 0x84, 0x5e, 0x09, 0x4a, 0xb6, 0xa0, 0x4b, 0x19, - 0x2c, 0x92, 0xbc, 0x60, 0xf0, 0xb5, 0x01, 0x9b, 0x4f, 0x54, 0x27, 0xf8, 0x1e, 0xd4, 0x18, 0xe9, - 0xa0, 0x3e, 0x1a, 0x9a, 0xe3, 0xfe, 0xc5, 0xe5, 0x01, 0xca, 0x52, 0xab, 0xe6, 0x4d, 0x7e, 0xa5, - 0x16, 0x8e, 0xb8, 0x58, 0x3c, 0x1a, 0x24, 0x82, 0x2d, 0x02, 0x71, 0x36, 0x9d, 0xd3, 0xb3, 0x81, - 0x5f, 0x63, 0x04, 0x1f, 0x82, 0xb9, 0xa4, 0x31, 0xa1, 0x62, 0xca, 0x48, 0xa7, 0xa6, 0xc1, 0x41, - 0x96, 0x5a, 0xc6, 0x6b, 0x1d, 0xfc, 0x2b, 0x6a, 0xe4, 0x90, 0x47, 0xf0, 0x11, 0x40, 0x28, 0x68, - 0x20, 0x29, 0x99, 0x06, 0xb2, 0x73, 0xa3, 0x8f, 0x86, 0xdb, 0xa3, 0xae, 0x9d, 0xb7, 0x6c, 0x97, - 0x2d, 0xdb, 0x6f, 0xca, 0x96, 0xc7, 0xc6, 0x79, 0x6a, 0x6d, 0x7c, 0xfe, 0x6e, 0x21, 0xdf, 0x2c, - 0x38, 0x57, 0x2a, 0x91, 0x55, 0x42, 0x4a, 0x91, 0xfa, 0xff, 0x88, 0x14, 0x9c, 0x2b, 0xf1, 0x21, - 0x00, 0xa1, 0x27, 0xb4, 0x10, 0xd9, 0xfc, 0xa7, 0x48, 0x3d, 0x17, 0x28, 0x18, 0x57, 0xe2, 0x87, - 0xd0, 0x58, 0xd2, 0x58, 0x2a, 0x7a, 0xeb, 0x9a, 0xf4, 0x96, 0x02, 0x5c, 0x89, 0x5d, 0xd8, 0x16, - 0x34, 0xa4, 0xec, 0x34, 0xbf, 0xbc, 0x71, 0x4d, 0x1c, 0x4a, 0xc8, 0x95, 0xf8, 0x31, 0x18, 0x41, - 0x38, 0xcf, 0x79, 0xe3, 0x9a, 0x7c, 0x43, 0x13, 0xae, 0xc4, 0x0f, 0xc0, 0x24, 0x4c, 0xd0, 0x50, - 0x32, 0x1e, 0x77, 0xcc, 0x3e, 0x1a, 0x36, 0x47, 0x5d, 0x7b, 0x6d, 0x48, 0x5b, 0xbb, 0xc3, 0x9e, - 0x94, 0x15, 0xfe, 0x55, 0x31, 0x1e, 0x03, 0x2e, 0x0c, 0x10, 0x24, 0x6c, 0x7a, 0x4a, 0xc5, 0x52, - 0x49, 0x40, 0x1f, 0x0d, 0x77, 0xc7, 0xed, 0x2c, 0xb5, 0x5a, 0xb9, 0x13, 0xdc, 0x57, 0xde, 0xbb, - 0x3c, 0xe7, 0xb7, 0xf2, 0x7a, 0x37, 0x61, 0x45, 0x04, 0x3f, 0x83, 0x76, 0x31, 0xc8, 0x9f, 0x2a, - 0xdb, 0x5a, 0x65, 0x3f, 0x4b, 0x2d, 0xec, 0x17, 0xf9, 0x8a, 0x0e, 0x2e, 0x99, 0x8a, 0x92, 0xb3, - 0xde, 0xa3, 0x36, 0xe4, 0x8e, 0x36, 0x64, 0x33, 0x4b, 0x2d, 0x28, 0x05, 0xbc, 0xc9, 0x7a, 0x6b, - 0xca, 0x7e, 0xb7, 0xa1, 0xae, 0x1e, 0x50, 0x67, 0x57, 0xcf, 0xbc, 0x57, 0x99, 0xf9, 0x39, 0x8b, - 0x89, 0xaf, 0x93, 0xf8, 0x0e, 0x40, 0x20, 0xa5, 0x60, 0xb3, 0x95, 0xa4, 0xcb, 0x4e, 0xb3, 0x8f, - 0x86, 0x3b, 0xe3, 0xfa, 0xcf, 0xcb, 0x03, 0xe4, 0x57, 0xe2, 0xf8, 0x10, 0xf6, 0x42, 0x1e, 0xab, - 0xde, 0x03, 0xb5, 0x19, 0x75, 0xff, 0x9e, 0xbe, 0x7f, 0xbf, 0x78, 0x49, 0xcd, 0xa3, 0x4a, 0xda, - 0x9b, 0xf8, 0xcd, 0x6a, 0xb9, 0x47, 0x06, 0x4f, 0xc1, 0x5c, 0xaf, 0x18, 0xb7, 0xa1, 0xf5, 0x36, - 0x9e, 0xc7, 0xfc, 0x53, 0xbc, 0x8e, 0xb5, 0x36, 0xf0, 0x0e, 0x18, 0x5e, 0x1c, 0xf2, 0x05, 0x8b, - 0xa3, 0x16, 0x52, 0xa7, 0x97, 0x2b, 0x19, 0x71, 0x75, 0xaa, 0x61, 0x03, 0xea, 0x2f, 0x38, 0xa1, - 0xad, 0x70, 0x7c, 0xf7, 0x3c, 0xeb, 0xa1, 0x6f, 0x59, 0x0f, 0x5d, 0x64, 0x3d, 0xf4, 0xe5, 0x47, - 0x6f, 0xe3, 0xfd, 0xad, 0x7c, 0x2e, 0x49, 0xc3, 0x63, 0x27, 0xe4, 0x82, 0x3a, 0xc5, 0xbf, 0xc7, - 0x6c, 0x4b, 0x7b, 0xe3, 0xfe, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0x69, 0x84, 0xcf, 0x40, 0x93, - 0x04, 0x00, 0x00, +func init() { proto.RegisterFile("api/p2p/event.proto", fileDescriptor_event_cd5100104215cb1d) } + +var fileDescriptor_event_cd5100104215cb1d = []byte{ + // 599 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x93, 0xcd, 0x6e, 0xd3, 0x4c, + 0x14, 0x86, 0x3b, 0xf9, 0xf2, 0x35, 0xf6, 0xb4, 0x4d, 0xa3, 0x21, 0x2a, 0x69, 0x16, 0x71, 0x14, + 0x58, 0x84, 0x8d, 0x8d, 0xc2, 0x86, 0x9f, 0x45, 0xe5, 0x34, 0x08, 0x2c, 0x24, 0x40, 0xe6, 0x67, + 0xc1, 0x26, 0x72, 0x3c, 0x83, 0x3b, 0x4a, 0x33, 0x33, 0x4c, 0x26, 0x45, 0xb9, 0x08, 0x24, 0x96, + 0x5c, 0x52, 0x97, 0x5c, 0x81, 0xa9, 0xcc, 0x86, 0x65, 0xc5, 0x15, 0xa0, 0x19, 0xdb, 0xa9, 0x59, + 0x20, 0xca, 0xca, 0xf6, 0x7b, 0xce, 0xfb, 0xf8, 0x9c, 0x33, 0x67, 0xe0, 0x8d, 0x48, 0x50, 0x4f, + 0x8c, 0x84, 0x47, 0xce, 0x08, 0x53, 0xae, 0x90, 0x5c, 0x71, 0x64, 0xcf, 0x88, 0x54, 0x6b, 0x57, + 0x8c, 0x44, 0x77, 0x60, 0xe2, 0x5a, 0x9d, 0xad, 0xde, 0x7b, 0x89, 0x8c, 0xc4, 0xc9, 0x87, 0xd3, + 0xf2, 0x99, 0xa7, 0x77, 0x51, 0xc9, 0x98, 0x53, 0x86, 0x0b, 0xad, 0x9d, 0xf0, 0x84, 0x9b, 0x57, + 0x4f, 0xbf, 0x15, 0xaa, 0x93, 0x70, 0x9e, 0x9c, 0x92, 0x2b, 0xa0, 0xa2, 0x0b, 0xb2, 0x54, 0xd1, + 0x42, 0xe4, 0x09, 0x83, 0x4f, 0x0d, 0xf8, 0xff, 0x63, 0x5d, 0x09, 0xba, 0x0b, 0x6b, 0x14, 0x77, + 0x40, 0x1f, 0x0c, 0xed, 0x71, 0xff, 0xe2, 0xf2, 0x10, 0x64, 0xa9, 0x53, 0x0b, 0x26, 0x3f, 0x53, + 0x07, 0x25, 0x5c, 0x2e, 0x1e, 0x0e, 0x84, 0xa4, 0x8b, 0x48, 0xae, 0xa7, 0x73, 0xb2, 0x1e, 0x84, + 0x35, 0x8a, 0xd1, 0x11, 0xb4, 0x97, 0x84, 0x61, 0x22, 0xa7, 0x14, 0x77, 0x6a, 0xc6, 0x38, 0xc8, + 0x52, 0xc7, 0x7a, 0x65, 0xc4, 0x3f, 0x5a, 0xad, 0xdc, 0x14, 0x60, 0x74, 0x0c, 0x61, 0x2c, 0x49, + 0xa4, 0x08, 0x9e, 0x46, 0xaa, 0xf3, 0x5f, 0x1f, 0x0c, 0x77, 0x46, 0x5d, 0x37, 0x2f, 0xd9, 0x2d, + 0x4b, 0x76, 0x5f, 0x97, 0x25, 0x8f, 0xad, 0xf3, 0xd4, 0xd9, 0xfa, 0xfc, 0xcd, 0x01, 0xa1, 0x5d, + 0xf8, 0x7c, 0xa5, 0x21, 0x2b, 0x81, 0x4b, 0x48, 0xfd, 0x5f, 0x20, 0x85, 0xcf, 0x57, 0xe8, 0x01, + 0x6c, 0x2c, 0x09, 0x53, 0x9a, 0xb0, 0xfd, 0x57, 0x42, 0xdd, 0xb8, 0xb7, 0xb5, 0xc1, 0x57, 0xc8, + 0x87, 0x3b, 0x92, 0xc4, 0x84, 0x9e, 0xe5, 0x05, 0x34, 0xae, 0x69, 0x87, 0xa5, 0xc9, 0x57, 0xe8, + 0x11, 0xb4, 0xa2, 0x78, 0x9e, 0xfb, 0xad, 0x6b, 0xfa, 0x1b, 0xc6, 0xe1, 0x2b, 0x74, 0x1f, 0xda, + 0x98, 0x4a, 0x12, 0x2b, 0xca, 0x59, 0xc7, 0xee, 0x83, 0x61, 0x73, 0xd4, 0x75, 0x37, 0xfb, 0xe4, + 0x9a, 0xc3, 0x75, 0x27, 0x65, 0x46, 0x78, 0x95, 0x8c, 0xc6, 0x10, 0x15, 0xe7, 0x17, 0x09, 0x3a, + 0x3d, 0x23, 0x72, 0xa9, 0x11, 0xb0, 0x0f, 0x86, 0x7b, 0xe3, 0x76, 0x96, 0x3a, 0xad, 0xfc, 0x20, + 0xfd, 0x97, 0xc1, 0xdb, 0x3c, 0x16, 0xb6, 0xf2, 0x7c, 0x5f, 0xd0, 0x42, 0x41, 0x4f, 0x61, 0xbb, + 0x68, 0xe4, 0x77, 0xca, 0x8e, 0xa1, 0x1c, 0x64, 0xa9, 0x83, 0xc2, 0x22, 0x5e, 0xe1, 0xa0, 0xd2, + 0x53, 0x21, 0x79, 0x9b, 0x39, 0x9a, 0x7d, 0xda, 0x35, 0xfb, 0xd4, 0xcc, 0x52, 0x07, 0x96, 0x80, + 0x60, 0xb2, 0x99, 0x9a, 0xde, 0x9e, 0x5b, 0xb0, 0xae, 0xf7, 0xbf, 0xb3, 0x67, 0x7a, 0xde, 0xaf, + 0xf4, 0xfc, 0x8c, 0x32, 0x1c, 0x9a, 0x20, 0xba, 0x0d, 0x61, 0xa4, 0x94, 0xa4, 0xb3, 0x95, 0x22, + 0xcb, 0x4e, 0xb3, 0x0f, 0x86, 0xbb, 0xe3, 0xfa, 0x8f, 0xcb, 0x43, 0x10, 0x56, 0x74, 0x74, 0x04, + 0xf7, 0x63, 0xce, 0x74, 0xed, 0x91, 0x9e, 0x8c, 0xfe, 0xff, 0xbe, 0xf9, 0xff, 0x41, 0x71, 0x11, + 0x9a, 0xc7, 0x95, 0x70, 0x30, 0x09, 0x9b, 0xd5, 0xf4, 0x00, 0x0f, 0x9e, 0x40, 0x7b, 0x33, 0x62, + 0xd4, 0x86, 0xad, 0x37, 0x6c, 0xce, 0xf8, 0x47, 0xb6, 0xd1, 0x5a, 0x5b, 0x68, 0x17, 0x5a, 0x01, + 0x8b, 0xf9, 0x82, 0xb2, 0xa4, 0x05, 0xf4, 0xd7, 0x8b, 0x95, 0x4a, 0xb8, 0xfe, 0xaa, 0x21, 0x0b, + 0xd6, 0x9f, 0x73, 0x4c, 0x5a, 0xf1, 0xf8, 0xce, 0x79, 0xd6, 0x03, 0x5f, 0xb3, 0x1e, 0xb8, 0xc8, + 0x7a, 0xe0, 0xcb, 0xf7, 0xde, 0xd6, 0xbb, 0x9b, 0x79, 0x5f, 0x8a, 0xc4, 0x27, 0x5e, 0xcc, 0x25, + 0xf1, 0x8a, 0xcb, 0x3f, 0xdb, 0x36, 0xbb, 0x71, 0xef, 0x57, 0x00, 0x00, 0x00, 0xff, 0xff, 0x28, + 0xe7, 0x7a, 0x3b, 0x52, 0x04, 0x00, 0x00, } diff --git a/core/api/p2p/event.proto b/core/api/p2p/event.proto index dbba53cd6c..f2140966d2 100644 --- a/core/api/p2p/event.proto +++ b/core/api/p2p/event.proto @@ -26,9 +26,6 @@ message Event { // This field is required by gorm. google.protobuf.Timestamp updated_at = 4 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false]; - // DeletedAt is not used but required by gorm. - google.protobuf.Timestamp deleted_at = 5 [(gogoproto.stdtime) = true]; - // SentAt is set to current date just after sending the event. google.protobuf.Timestamp sent_at = 6 [(gogoproto.stdtime) = true]; diff --git a/core/entity/config.pb.go b/core/entity/config.pb.go index f8688516c3..bc99405189 100644 --- a/core/entity/config.pb.go +++ b/core/entity/config.pb.go @@ -28,25 +28,24 @@ var _ = time.Kitchen const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package type Config struct { - ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty" gorm:"primary_key"` - CreatedAt time.Time `protobuf:"bytes,2,opt,name=created_at,json=createdAt,stdtime" json:"created_at"` - UpdatedAt time.Time `protobuf:"bytes,3,opt,name=updated_at,json=updatedAt,stdtime" json:"updated_at"` - DeletedAt *time.Time `protobuf:"bytes,4,opt,name=deleted_at,json=deletedAt,stdtime" json:"deleted_at,omitempty"` - Myself *Contact `protobuf:"bytes,5,opt,name=myself" json:"myself,omitempty"` - MyselfID string `protobuf:"bytes,6,opt,name=myself_id,json=myselfId,proto3" json:"myself_id,omitempty"` - CurrentDevice *Device `protobuf:"bytes,7,opt,name=current_device,json=currentDevice" json:"current_device,omitempty"` - CurrentDeviceID string `protobuf:"bytes,8,opt,name=current_device_id,json=currentDeviceId,proto3" json:"current_device_id,omitempty"` - CryptoParams []byte `protobuf:"bytes,9,opt,name=crypto_params,json=cryptoParams,proto3" json:"crypto_params,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty" gorm:"primary_key"` + CreatedAt time.Time `protobuf:"bytes,2,opt,name=created_at,json=createdAt,stdtime" json:"created_at"` + UpdatedAt time.Time `protobuf:"bytes,3,opt,name=updated_at,json=updatedAt,stdtime" json:"updated_at"` + Myself *Contact `protobuf:"bytes,5,opt,name=myself" json:"myself,omitempty"` + MyselfID string `protobuf:"bytes,6,opt,name=myself_id,json=myselfId,proto3" json:"myself_id,omitempty"` + CurrentDevice *Device `protobuf:"bytes,7,opt,name=current_device,json=currentDevice" json:"current_device,omitempty"` + CurrentDeviceID string `protobuf:"bytes,8,opt,name=current_device_id,json=currentDeviceId,proto3" json:"current_device_id,omitempty"` + CryptoParams []byte `protobuf:"bytes,9,opt,name=crypto_params,json=cryptoParams,proto3" json:"crypto_params,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *Config) Reset() { *m = Config{} } func (m *Config) String() string { return proto.CompactTextString(m) } func (*Config) ProtoMessage() {} func (*Config) Descriptor() ([]byte, []int) { - return fileDescriptor_config_2f8db6232af726cf, []int{0} + return fileDescriptor_config_dd301a0a6a501bc2, []int{0} } func (m *Config) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -96,13 +95,6 @@ func (m *Config) GetUpdatedAt() time.Time { return time.Time{} } -func (m *Config) GetDeletedAt() *time.Time { - if m != nil { - return m.DeletedAt - } - return nil -} - func (m *Config) GetMyself() *Contact { if m != nil { return m.Myself @@ -178,25 +170,15 @@ func (m *Config) MarshalTo(dAtA []byte) (int, error) { return 0, err } i += n2 - if m.DeletedAt != nil { - dAtA[i] = 0x22 - i++ - i = encodeVarintConfig(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdTime(*m.DeletedAt))) - n3, err := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.DeletedAt, dAtA[i:]) - if err != nil { - return 0, err - } - i += n3 - } if m.Myself != nil { dAtA[i] = 0x2a i++ i = encodeVarintConfig(dAtA, i, uint64(m.Myself.Size())) - n4, err := m.Myself.MarshalTo(dAtA[i:]) + n3, err := m.Myself.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n4 + i += n3 } if len(m.MyselfID) > 0 { dAtA[i] = 0x32 @@ -208,11 +190,11 @@ func (m *Config) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0x3a i++ i = encodeVarintConfig(dAtA, i, uint64(m.CurrentDevice.Size())) - n5, err := m.CurrentDevice.MarshalTo(dAtA[i:]) + n4, err := m.CurrentDevice.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n5 + i += n4 } if len(m.CurrentDeviceID) > 0 { dAtA[i] = 0x42 @@ -255,10 +237,6 @@ func (m *Config) Size() (n int) { n += 1 + l + sovConfig(uint64(l)) l = github_com_gogo_protobuf_types.SizeOfStdTime(m.UpdatedAt) n += 1 + l + sovConfig(uint64(l)) - if m.DeletedAt != nil { - l = github_com_gogo_protobuf_types.SizeOfStdTime(*m.DeletedAt) - n += 1 + l + sovConfig(uint64(l)) - } if m.Myself != nil { l = m.Myself.Size() n += 1 + l + sovConfig(uint64(l)) @@ -416,39 +394,6 @@ func (m *Config) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field DeletedAt", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowConfig - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthConfig - } - postIndex := iNdEx + msglen - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.DeletedAt == nil { - m.DeletedAt = new(time.Time) - } - if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(m.DeletedAt, dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex case 5: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Myself", wireType) @@ -731,34 +676,33 @@ var ( ErrIntOverflowConfig = fmt.Errorf("proto: integer overflow") ) -func init() { proto.RegisterFile("entity/config.proto", fileDescriptor_config_2f8db6232af726cf) } +func init() { proto.RegisterFile("entity/config.proto", fileDescriptor_config_dd301a0a6a501bc2) } -var fileDescriptor_config_2f8db6232af726cf = []byte{ - // 416 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x51, 0xcf, 0x8a, 0xd3, 0x40, - 0x18, 0xdf, 0xe9, 0xae, 0xb5, 0x1d, 0xb3, 0x2e, 0xce, 0x56, 0x09, 0x45, 0x92, 0x52, 0x2f, 0x11, - 0x34, 0x01, 0xbd, 0xe9, 0x61, 0x69, 0x93, 0x4b, 0x0e, 0x82, 0x04, 0x4f, 0x5e, 0x42, 0x3a, 0x33, - 0x8d, 0x83, 0x4d, 0x27, 0x4c, 0xbf, 0x0a, 0x79, 0x0b, 0x8f, 0x3e, 0xd2, 0x1e, 0x7d, 0x82, 0x28, - 0xf1, 0x0d, 0x7c, 0x00, 0x91, 0xce, 0x4c, 0xb0, 0x3d, 0xc9, 0xde, 0xe6, 0xfb, 0x7d, 0xbf, 0x7f, - 0x7c, 0x83, 0xaf, 0xf9, 0x16, 0x04, 0x34, 0x11, 0x95, 0xdb, 0xb5, 0x28, 0xc3, 0x5a, 0x49, 0x90, - 0xc4, 0x59, 0x71, 0x05, 0x4d, 0x68, 0x56, 0xd3, 0x49, 0x29, 0x4b, 0xa9, 0x17, 0xd1, 0xe1, 0x65, - 0x38, 0x53, 0xbf, 0x94, 0xb2, 0xdc, 0xf0, 0x48, 0x4f, 0xab, 0xfd, 0x3a, 0x02, 0x51, 0xf1, 0x1d, - 0x14, 0x55, 0x6d, 0x09, 0x93, 0x7f, 0xce, 0x50, 0x50, 0xb0, 0x68, 0x9f, 0xc7, 0xf8, 0x17, 0x41, - 0xb9, 0x01, 0xe7, 0x7f, 0xce, 0xf1, 0x30, 0xd6, 0x05, 0xc8, 0x0b, 0x3c, 0x10, 0xcc, 0x45, 0x33, - 0x14, 0x8c, 0x97, 0x4f, 0xbb, 0xd6, 0x1f, 0xa4, 0xc9, 0xef, 0xd6, 0x27, 0xa5, 0x54, 0xd5, 0x9b, - 0x79, 0xad, 0x44, 0x55, 0xa8, 0x26, 0xff, 0xcc, 0x9b, 0x79, 0x36, 0x10, 0x8c, 0xc4, 0x18, 0x53, - 0xc5, 0x0b, 0xe0, 0x2c, 0x2f, 0xc0, 0x1d, 0xcc, 0x50, 0xf0, 0xe0, 0xd5, 0x34, 0x34, 0xcd, 0xc2, - 0xbe, 0x59, 0xf8, 0xa1, 0x6f, 0xb6, 0x1c, 0xdd, 0xb6, 0xfe, 0xd9, 0xd7, 0x1f, 0x3e, 0xca, 0xc6, - 0x56, 0xb7, 0x80, 0x83, 0xc9, 0xbe, 0x66, 0xbd, 0xc9, 0xf9, 0x5d, 0x4c, 0xac, 0x6e, 0x01, 0xe4, - 0x06, 0x63, 0xc6, 0x37, 0xdc, 0x9a, 0x5c, 0xfc, 0xd7, 0xe4, 0xc2, 0x18, 0x58, 0xcd, 0x02, 0xc8, - 0x4b, 0x3c, 0xac, 0x9a, 0x1d, 0xdf, 0xac, 0xdd, 0x7b, 0x5a, 0xfc, 0x38, 0x3c, 0xfe, 0x84, 0x30, - 0x36, 0x57, 0xcc, 0x2c, 0x89, 0x3c, 0xc7, 0x63, 0xf3, 0xca, 0x05, 0x73, 0x87, 0xfa, 0x5c, 0x4e, - 0xd7, 0xfa, 0xa3, 0x77, 0x1a, 0x4c, 0x93, 0x6c, 0x64, 0xd6, 0x29, 0x23, 0x6f, 0xf1, 0x43, 0xba, - 0x57, 0x8a, 0x6f, 0x21, 0x37, 0x57, 0x77, 0xef, 0xeb, 0x84, 0xc9, 0x69, 0x42, 0xa2, 0x77, 0xd9, - 0xa5, 0xe5, 0x9a, 0x91, 0xdc, 0xe0, 0x47, 0xa7, 0xe2, 0x43, 0xde, 0x48, 0xe7, 0x5d, 0x77, 0xad, - 0x7f, 0x15, 0x1f, 0xb3, 0xd3, 0x24, 0xbb, 0x3a, 0x91, 0xa7, 0x8c, 0x3c, 0xc3, 0x97, 0x54, 0x35, - 0x35, 0xc8, 0xbc, 0x2e, 0x54, 0x51, 0xed, 0xdc, 0xf1, 0x0c, 0x05, 0x4e, 0xe6, 0x18, 0xf0, 0xbd, - 0xc6, 0x96, 0xc1, 0x6d, 0xe7, 0xa1, 0xef, 0x9d, 0x87, 0x7e, 0x76, 0x1e, 0xfa, 0xf6, 0xcb, 0x3b, - 0xfb, 0xf8, 0xc4, 0x74, 0x03, 0x4e, 0x3f, 0x45, 0x54, 0x2a, 0x1e, 0x99, 0x96, 0xab, 0xa1, 0xbe, - 0xe5, 0xeb, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x6c, 0x29, 0xd3, 0x39, 0xb8, 0x02, 0x00, 0x00, +var fileDescriptor_config_dd301a0a6a501bc2 = []byte{ + // 397 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x50, 0xb1, 0xce, 0xd3, 0x30, + 0x18, 0xac, 0x53, 0x11, 0x12, 0x93, 0x52, 0xe1, 0x16, 0x14, 0x55, 0x28, 0xa9, 0xca, 0x12, 0x24, + 0x48, 0x24, 0xd8, 0x60, 0x40, 0x6d, 0xb2, 0x64, 0x40, 0x42, 0x11, 0x13, 0x4b, 0x94, 0xda, 0x6e, + 0xb0, 0x68, 0xea, 0xc8, 0x75, 0x91, 0xf2, 0x16, 0x8c, 0xbc, 0x0c, 0x7b, 0x47, 0x9e, 0x20, 0xa0, + 0xf0, 0x06, 0x3c, 0x01, 0xaa, 0x9d, 0x88, 0x76, 0xfc, 0x37, 0x7f, 0xf7, 0xdd, 0x77, 0x77, 0x3e, + 0x38, 0xa3, 0x07, 0xc9, 0x64, 0x13, 0x61, 0x7e, 0xd8, 0xb1, 0x32, 0xac, 0x05, 0x97, 0x1c, 0x39, + 0x5b, 0x2a, 0x64, 0x13, 0xea, 0xd5, 0x62, 0x5e, 0xf2, 0x92, 0xab, 0x45, 0x74, 0x79, 0x69, 0xce, + 0xc2, 0x2f, 0x39, 0x2f, 0xf7, 0x34, 0x52, 0xd3, 0xf6, 0xb4, 0x8b, 0x24, 0xab, 0xe8, 0x51, 0x16, + 0x55, 0xdd, 0x13, 0xe6, 0xff, 0x95, 0x65, 0x81, 0x65, 0x8f, 0x0e, 0x7e, 0x84, 0x7e, 0x65, 0x98, + 0x6a, 0x70, 0xf5, 0x63, 0x0c, 0xcd, 0x58, 0x05, 0x40, 0x2f, 0xa0, 0xc1, 0x88, 0x0b, 0x96, 0x20, + 0xb0, 0x37, 0x4f, 0xbb, 0xd6, 0x37, 0xd2, 0xe4, 0x6f, 0xeb, 0xa3, 0x92, 0x8b, 0xea, 0xcd, 0xaa, + 0x16, 0xac, 0x2a, 0x44, 0x93, 0x7f, 0xa1, 0xcd, 0x2a, 0x33, 0x18, 0x41, 0x31, 0x84, 0x58, 0xd0, + 0x42, 0x52, 0x92, 0x17, 0xd2, 0x35, 0x96, 0x20, 0x78, 0xf0, 0x6a, 0x11, 0xea, 0x64, 0xe1, 0x90, + 0x2c, 0xfc, 0x38, 0x24, 0xdb, 0x58, 0xe7, 0xd6, 0x1f, 0x7d, 0xfb, 0xe5, 0x83, 0xcc, 0xee, 0xef, + 0xd6, 0xf2, 0x22, 0x72, 0xaa, 0xc9, 0x20, 0x32, 0xbe, 0x8b, 0x48, 0x7f, 0xb7, 0x96, 0xe8, 0x25, + 0x34, 0xab, 0xe6, 0x48, 0xf7, 0x3b, 0xf7, 0x9e, 0x12, 0x78, 0x1c, 0x5e, 0x77, 0x18, 0xc6, 0xba, + 0x84, 0xac, 0x27, 0xa1, 0xe7, 0xd0, 0xd6, 0xaf, 0x9c, 0x11, 0xd7, 0x54, 0xbf, 0x75, 0xba, 0xd6, + 0xb7, 0xde, 0x2b, 0x30, 0x4d, 0x32, 0x4b, 0xaf, 0x53, 0x82, 0xde, 0xc2, 0x87, 0xf8, 0x24, 0x04, + 0x3d, 0xc8, 0x5c, 0x97, 0xe6, 0xde, 0x57, 0x0e, 0xf3, 0x5b, 0x87, 0x44, 0xed, 0xb2, 0x49, 0xcf, + 0xd5, 0x23, 0x7a, 0x07, 0x1f, 0xdd, 0x1e, 0x5f, 0xfc, 0x2c, 0xe5, 0x37, 0xeb, 0x5a, 0x7f, 0x1a, + 0x5f, 0xb3, 0xd3, 0x24, 0x9b, 0xde, 0x9c, 0xa7, 0x04, 0x3d, 0x83, 0x13, 0x2c, 0x9a, 0x5a, 0xf2, + 0xbc, 0x2e, 0x44, 0x51, 0x1d, 0x5d, 0x7b, 0x09, 0x02, 0x27, 0x73, 0x34, 0xf8, 0x41, 0x61, 0x9b, + 0xe0, 0xdc, 0x79, 0xe0, 0x67, 0xe7, 0x81, 0xdf, 0x9d, 0x07, 0xbe, 0xff, 0xf1, 0x46, 0x9f, 0x9e, + 0xe8, 0x6c, 0x92, 0xe2, 0xcf, 0x11, 0xe6, 0x82, 0x46, 0x3a, 0xe5, 0xd6, 0x54, 0x7d, 0xbe, 0xfe, + 0x17, 0x00, 0x00, 0xff, 0xff, 0xce, 0x9a, 0x79, 0x9f, 0x77, 0x02, 0x00, 0x00, } diff --git a/core/entity/config.proto b/core/entity/config.proto index b72b3284bc..04a1e24bbc 100644 --- a/core/entity/config.proto +++ b/core/entity/config.proto @@ -17,7 +17,6 @@ message Config { string id = 1 [(gogoproto.moretags) = "gorm:\"primary_key\"", (gogoproto.customname) = "ID"]; google.protobuf.Timestamp created_at = 2 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false]; google.protobuf.Timestamp updated_at = 3 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false]; - google.protobuf.Timestamp deleted_at = 4 [(gogoproto.stdtime) = true]; // // myself diff --git a/core/entity/contact.pb.go b/core/entity/contact.pb.go index d8037e16d9..efc4f9d122 100644 --- a/core/entity/contact.pb.go +++ b/core/entity/contact.pb.go @@ -63,14 +63,13 @@ func (x Contact_Status) String() string { return proto.EnumName(Contact_Status_name, int32(x)) } func (Contact_Status) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_contact_5629d0fedea6cfa4, []int{0, 0} + return fileDescriptor_contact_128388a246b6f33e, []int{0, 0} } type Contact struct { ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty" gorm:"primary_key"` CreatedAt time.Time `protobuf:"bytes,2,opt,name=created_at,json=createdAt,stdtime" json:"created_at"` UpdatedAt time.Time `protobuf:"bytes,3,opt,name=updated_at,json=updatedAt,stdtime" json:"updated_at"` - DeletedAt *time.Time `protobuf:"bytes,4,opt,name=deleted_at,json=deletedAt,stdtime" json:"deleted_at,omitempty"` Sigchain []byte `protobuf:"bytes,10,opt,name=sigchain,proto3" json:"sigchain,omitempty"` Status Contact_Status `protobuf:"varint,11,opt,name=status,proto3,enum=berty.entity.Contact_Status" json:"status,omitempty"` Devices []*Device `protobuf:"bytes,12,rep,name=devices" json:"devices,omitempty"` @@ -87,7 +86,7 @@ func (m *Contact) Reset() { *m = Contact{} } func (m *Contact) String() string { return proto.CompactTextString(m) } func (*Contact) ProtoMessage() {} func (*Contact) Descriptor() ([]byte, []int) { - return fileDescriptor_contact_5629d0fedea6cfa4, []int{0} + return fileDescriptor_contact_128388a246b6f33e, []int{0} } func (m *Contact) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -137,13 +136,6 @@ func (m *Contact) GetUpdatedAt() time.Time { return time.Time{} } -func (m *Contact) GetDeletedAt() *time.Time { - if m != nil { - return m.DeletedAt - } - return nil -} - func (m *Contact) GetSigchain() []byte { if m != nil { return m.Sigchain @@ -234,16 +226,6 @@ func (m *Contact) MarshalTo(dAtA []byte) (int, error) { return 0, err } i += n2 - if m.DeletedAt != nil { - dAtA[i] = 0x22 - i++ - i = encodeVarintContact(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdTime(*m.DeletedAt))) - n3, err := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.DeletedAt, dAtA[i:]) - if err != nil { - return 0, err - } - i += n3 - } if len(m.Sigchain) > 0 { dAtA[i] = 0x52 i++ @@ -322,10 +304,6 @@ func (m *Contact) Size() (n int) { n += 1 + l + sovContact(uint64(l)) l = github_com_gogo_protobuf_types.SizeOfStdTime(m.UpdatedAt) n += 1 + l + sovContact(uint64(l)) - if m.DeletedAt != nil { - l = github_com_gogo_protobuf_types.SizeOfStdTime(*m.DeletedAt) - n += 1 + l + sovContact(uint64(l)) - } l = len(m.Sigchain) if l > 0 { n += 1 + l + sovContact(uint64(l)) @@ -492,39 +470,6 @@ func (m *Contact) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field DeletedAt", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowContact - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthContact - } - postIndex := iNdEx + msglen - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.DeletedAt == nil { - m.DeletedAt = new(time.Time) - } - if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(m.DeletedAt, dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex case 10: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Sigchain", wireType) @@ -849,42 +794,40 @@ var ( ErrIntOverflowContact = fmt.Errorf("proto: integer overflow") ) -func init() { proto.RegisterFile("entity/contact.proto", fileDescriptor_contact_5629d0fedea6cfa4) } - -var fileDescriptor_contact_5629d0fedea6cfa4 = []byte{ - // 530 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x51, 0xcd, 0x6e, 0xd3, 0x4c, - 0x14, 0xad, 0xd3, 0x36, 0x6d, 0xc6, 0xf9, 0xb1, 0x26, 0xe9, 0xf7, 0x99, 0x08, 0x25, 0x26, 0x12, - 0x92, 0xc5, 0xc2, 0x46, 0x01, 0xb1, 0x60, 0x83, 0x92, 0x46, 0x48, 0x59, 0x94, 0x85, 0x29, 0x1b, - 0x36, 0xd1, 0xc4, 0xbe, 0x75, 0x46, 0xb1, 0x3d, 0xee, 0xcc, 0xb8, 0xc8, 0x6f, 0xc1, 0x92, 0x17, - 0xe1, 0x1d, 0xba, 0xe4, 0x09, 0x42, 0x15, 0x5e, 0x00, 0xf1, 0x04, 0x28, 0xf6, 0xb8, 0xb4, 0xb0, - 0x40, 0xac, 0x66, 0xee, 0xb9, 0xe7, 0x9c, 0x7b, 0x74, 0x2f, 0xea, 0x41, 0x22, 0xa9, 0xcc, 0x5d, - 0x9f, 0x25, 0x92, 0xf8, 0xd2, 0x49, 0x39, 0x93, 0x0c, 0x37, 0x97, 0xc0, 0x65, 0xee, 0x94, 0xbd, - 0xfe, 0x88, 0xa4, 0xd4, 0x2d, 0x1a, 0xcb, 0xec, 0xc2, 0x0d, 0x39, 0x49, 0x57, 0x97, 0x51, 0xf5, - 0x96, 0x8a, 0x7e, 0x2f, 0x64, 0x21, 0x2b, 0xbe, 0xee, 0xee, 0xa7, 0xd0, 0x61, 0xc8, 0x58, 0x18, - 0xc1, 0x2f, 0xb1, 0xa4, 0x31, 0x08, 0x49, 0xe2, 0x54, 0x11, 0xba, 0x6a, 0x7c, 0x00, 0x57, 0xd4, - 0x87, 0x12, 0x1c, 0x7d, 0x3e, 0x44, 0x47, 0xa7, 0x65, 0x1e, 0xfc, 0x14, 0xd5, 0x68, 0x60, 0x6a, - 0x96, 0x66, 0x37, 0xa6, 0xd6, 0xcd, 0xf7, 0x07, 0xda, 0x76, 0x33, 0xac, 0xcd, 0x67, 0x3f, 0x36, - 0x43, 0x1c, 0x32, 0x1e, 0xbf, 0x1c, 0xa5, 0x9c, 0xc6, 0x84, 0xe7, 0x8b, 0x35, 0xe4, 0x23, 0xaf, - 0x46, 0x03, 0x7c, 0x8a, 0x90, 0xcf, 0x81, 0x48, 0x08, 0x16, 0x44, 0x9a, 0x35, 0x4b, 0xb3, 0xf5, - 0x71, 0xdf, 0x29, 0x83, 0x38, 0x55, 0x10, 0xe7, 0xbc, 0x0a, 0x32, 0x3d, 0xbe, 0xde, 0x0c, 0xf7, - 0x3e, 0x7e, 0x1d, 0x6a, 0x5e, 0x43, 0xe9, 0x26, 0x72, 0x67, 0x92, 0xa5, 0x41, 0x65, 0xb2, 0xff, - 0x2f, 0x26, 0x4a, 0x37, 0x91, 0xf8, 0x15, 0x42, 0x01, 0x44, 0xa0, 0x4c, 0x0e, 0xfe, 0x6a, 0x72, - 0x50, 0x1a, 0x28, 0xcd, 0x44, 0xe2, 0x3e, 0x3a, 0x16, 0x34, 0xf4, 0x57, 0x84, 0x26, 0x26, 0xb2, - 0x34, 0xbb, 0xe9, 0xdd, 0xd6, 0xf8, 0x39, 0xaa, 0x0b, 0x49, 0x64, 0x26, 0x4c, 0xdd, 0xd2, 0xec, - 0xf6, 0xf8, 0xa1, 0x73, 0xf7, 0x66, 0x8e, 0xda, 0x9f, 0xf3, 0xb6, 0xe0, 0x78, 0x8a, 0x8b, 0x1d, - 0x74, 0x54, 0xae, 0x5a, 0x98, 0x4d, 0x6b, 0xdf, 0xd6, 0xc7, 0xbd, 0xfb, 0xb2, 0x59, 0xd1, 0xf4, - 0x2a, 0x12, 0x7e, 0x84, 0x9a, 0x01, 0x15, 0x69, 0x44, 0xf2, 0x45, 0x42, 0x62, 0x30, 0x5b, 0xbb, - 0x43, 0x78, 0xba, 0xc2, 0xde, 0x90, 0x18, 0xf0, 0x63, 0xd4, 0xae, 0x28, 0x2a, 0x50, 0xbb, 0x20, - 0xb5, 0x14, 0x5a, 0x26, 0xc0, 0x63, 0x74, 0xc2, 0xae, 0x80, 0x73, 0x1a, 0xc0, 0xe2, 0x9e, 0x65, - 0xa7, 0x60, 0x77, 0xab, 0xe6, 0xec, 0x8e, 0xf5, 0x0b, 0xf4, 0xff, 0x1f, 0x1a, 0x35, 0xc3, 0x28, - 0x54, 0x27, 0xbf, 0xa9, 0xca, 0x59, 0xa3, 0x0c, 0xd5, 0xd5, 0x54, 0x1d, 0x1d, 0xbd, 0x4b, 0xd6, - 0x09, 0xfb, 0x90, 0x18, 0x7b, 0xb8, 0x89, 0x8e, 0xe7, 0xe2, 0x35, 0xa7, 0x90, 0x04, 0x86, 0x86, - 0xbb, 0xa8, 0x33, 0x17, 0xe7, 0x3c, 0x13, 0x12, 0x02, 0x05, 0xd6, 0x70, 0x07, 0xe9, 0x73, 0xe1, - 0xc1, 0x65, 0x06, 0x3b, 0xd8, 0xd8, 0xdf, 0x01, 0xb7, 0xe5, 0x19, 0x18, 0x07, 0xb8, 0x85, 0x1a, - 0x73, 0x31, 0x8d, 0x98, 0xbf, 0x86, 0xc0, 0x38, 0xc4, 0x08, 0xd5, 0xcf, 0x72, 0x01, 0xd1, 0x85, - 0xf1, 0x64, 0x6a, 0x5f, 0x6f, 0x07, 0xda, 0x97, 0xed, 0x40, 0xbb, 0xd9, 0x0e, 0xb4, 0x4f, 0xdf, - 0x06, 0x7b, 0xef, 0xff, 0x2b, 0x97, 0x2b, 0xc1, 0x5f, 0xb9, 0x3e, 0xe3, 0xe0, 0x96, 0x6b, 0x5e, - 0xd6, 0x8b, 0xeb, 0x3f, 0xfb, 0x19, 0x00, 0x00, 0xff, 0xff, 0x3f, 0x33, 0xb5, 0x51, 0x7e, 0x03, - 0x00, 0x00, +func init() { proto.RegisterFile("entity/contact.proto", fileDescriptor_contact_128388a246b6f33e) } + +var fileDescriptor_contact_128388a246b6f33e = []byte{ + // 509 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x52, 0xcd, 0x6e, 0xd3, 0x40, + 0x18, 0x8c, 0x93, 0x92, 0x9f, 0x75, 0x7e, 0xac, 0x4d, 0x0a, 0x26, 0x42, 0x89, 0x89, 0x84, 0x64, + 0x71, 0xb0, 0x51, 0x40, 0x1c, 0xb8, 0x35, 0x8d, 0x90, 0x72, 0x28, 0x07, 0x53, 0x2e, 0x5c, 0xa2, + 0x8d, 0xfd, 0xd5, 0x59, 0x25, 0xf6, 0xba, 0xbb, 0xeb, 0x22, 0xbf, 0x05, 0x47, 0x1e, 0xa9, 0x47, + 0x9e, 0x20, 0x54, 0xe1, 0x05, 0x10, 0xe2, 0x01, 0x50, 0xec, 0x75, 0x69, 0xe1, 0xc4, 0xc9, 0xbb, + 0xf3, 0xcd, 0xcc, 0x37, 0x1e, 0x2d, 0x1a, 0x40, 0x2c, 0xa9, 0xcc, 0x5c, 0x9f, 0xc5, 0x92, 0xf8, + 0xd2, 0x49, 0x38, 0x93, 0x0c, 0xb7, 0x57, 0xc0, 0x65, 0xe6, 0x14, 0xb3, 0xe1, 0x84, 0x24, 0xd4, + 0xcd, 0x07, 0xab, 0xf4, 0xc2, 0x0d, 0x39, 0x49, 0xd6, 0x97, 0xdb, 0xf2, 0x5b, 0x28, 0x86, 0x83, + 0x90, 0x85, 0x2c, 0x3f, 0xba, 0x87, 0x93, 0x42, 0xc7, 0x21, 0x63, 0xe1, 0x16, 0xfe, 0x88, 0x25, + 0x8d, 0x40, 0x48, 0x12, 0x25, 0x8a, 0xd0, 0x57, 0xeb, 0x03, 0xb8, 0xa2, 0x3e, 0x14, 0xe0, 0xe4, + 0xd7, 0x11, 0x6a, 0x9c, 0x16, 0x79, 0xf0, 0x0b, 0x54, 0xa5, 0x81, 0xa9, 0x59, 0x9a, 0xdd, 0x9a, + 0x59, 0x37, 0x3f, 0x1e, 0x6b, 0xfb, 0xdd, 0xb8, 0xba, 0x98, 0xff, 0xdc, 0x8d, 0x71, 0xc8, 0x78, + 0xf4, 0x66, 0x92, 0x70, 0x1a, 0x11, 0x9e, 0x2d, 0x37, 0x90, 0x4d, 0xbc, 0x2a, 0x0d, 0xf0, 0x29, + 0x42, 0x3e, 0x07, 0x22, 0x21, 0x58, 0x12, 0x69, 0x56, 0x2d, 0xcd, 0xd6, 0xa7, 0x43, 0xa7, 0x08, + 0xe2, 0x94, 0x41, 0x9c, 0xf3, 0x32, 0xc8, 0xac, 0x79, 0xbd, 0x1b, 0x57, 0x3e, 0x7f, 0x1b, 0x6b, + 0x5e, 0x4b, 0xe9, 0x4e, 0xe4, 0xc1, 0x24, 0x4d, 0x82, 0xd2, 0xa4, 0xf6, 0x3f, 0x26, 0x4a, 0x77, + 0x22, 0xf1, 0x10, 0x35, 0x05, 0x0d, 0xfd, 0x35, 0xa1, 0xb1, 0x89, 0x2c, 0xcd, 0x6e, 0x7b, 0xb7, + 0x77, 0xfc, 0x0a, 0xd5, 0x85, 0x24, 0x32, 0x15, 0xa6, 0x6e, 0x69, 0x76, 0x77, 0xfa, 0xc4, 0xb9, + 0x5b, 0xb9, 0xa3, 0x7e, 0xdf, 0x79, 0x9f, 0x73, 0x3c, 0xc5, 0xc5, 0x0e, 0x6a, 0x14, 0x4d, 0x09, + 0xb3, 0x6d, 0xd5, 0x6c, 0x7d, 0x3a, 0xb8, 0x2f, 0x9b, 0xe7, 0x43, 0xaf, 0x24, 0xe1, 0xa7, 0xa8, + 0x1d, 0x50, 0x91, 0x6c, 0x49, 0xb6, 0x8c, 0x49, 0x04, 0x66, 0xe7, 0xd0, 0xa3, 0xa7, 0x2b, 0xec, + 0x1d, 0x89, 0x00, 0x3f, 0x43, 0xdd, 0x92, 0xa2, 0x02, 0x75, 0x73, 0x52, 0x47, 0xa1, 0x45, 0x02, + 0x3c, 0x45, 0xc7, 0xec, 0x0a, 0x38, 0xa7, 0x01, 0x2c, 0xef, 0x59, 0xf6, 0x72, 0x76, 0xbf, 0x1c, + 0xce, 0xef, 0x58, 0xbf, 0x46, 0x8f, 0xfe, 0xd1, 0xa8, 0x1d, 0x46, 0xae, 0x3a, 0xfe, 0x4b, 0x55, + 0xec, 0x9a, 0xa4, 0xa8, 0xae, 0xb6, 0xea, 0xa8, 0xf1, 0x21, 0xde, 0xc4, 0xec, 0x53, 0x6c, 0x54, + 0x70, 0x1b, 0x35, 0x17, 0xe2, 0x2d, 0xa7, 0x10, 0x07, 0x86, 0x86, 0xfb, 0xa8, 0xb7, 0x10, 0xe7, + 0x3c, 0x15, 0x12, 0x02, 0x05, 0x56, 0x71, 0x0f, 0xe9, 0x0b, 0xe1, 0xc1, 0x65, 0x0a, 0x07, 0xd8, + 0xa8, 0x1d, 0x80, 0xdb, 0xeb, 0x19, 0x18, 0x47, 0xb8, 0x83, 0x5a, 0x0b, 0x31, 0xdb, 0x32, 0x7f, + 0x03, 0x81, 0xf1, 0x00, 0x23, 0x54, 0x3f, 0xcb, 0x04, 0x6c, 0x2f, 0x8c, 0xe7, 0x33, 0xfb, 0x7a, + 0x3f, 0xd2, 0xbe, 0xee, 0x47, 0xda, 0xcd, 0x7e, 0xa4, 0x7d, 0xf9, 0x3e, 0xaa, 0x7c, 0x7c, 0x58, + 0x94, 0x2b, 0xc1, 0x5f, 0xbb, 0x3e, 0xe3, 0xe0, 0x16, 0x35, 0xaf, 0xea, 0xf9, 0x0b, 0x78, 0xf9, + 0x3b, 0x00, 0x00, 0xff, 0xff, 0x8f, 0xdb, 0xf1, 0xc3, 0x3d, 0x03, 0x00, 0x00, } diff --git a/core/entity/contact.proto b/core/entity/contact.proto index 019e692d5d..62bedf2887 100644 --- a/core/entity/contact.proto +++ b/core/entity/contact.proto @@ -27,7 +27,6 @@ message Contact { string id = 1 [(gql.graphql_id) = true, (gogoproto.moretags) = "gorm:\"primary_key\"", (gogoproto.customname) = "ID"]; google.protobuf.Timestamp created_at = 2 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false]; google.protobuf.Timestamp updated_at = 3 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false]; - google.protobuf.Timestamp deleted_at = 4 [(gogoproto.stdtime) = true]; // // internal fields diff --git a/core/entity/conversation.pb.go b/core/entity/conversation.pb.go index 0fe422d264..632db57a50 100644 --- a/core/entity/conversation.pb.go +++ b/core/entity/conversation.pb.go @@ -54,14 +54,13 @@ func (x ConversationMember_Status) String() string { return proto.EnumName(ConversationMember_Status_name, int32(x)) } func (ConversationMember_Status) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_conversation_da9fecc99e247077, []int{1, 0} + return fileDescriptor_conversation_449f60adfd7d84bd, []int{1, 0} } type Conversation struct { ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty" gorm:"primary_key"` CreatedAt time.Time `protobuf:"bytes,2,opt,name=created_at,json=createdAt,stdtime" json:"created_at"` UpdatedAt time.Time `protobuf:"bytes,3,opt,name=updated_at,json=updatedAt,stdtime" json:"updated_at"` - DeletedAt *time.Time `protobuf:"bytes,4,opt,name=deleted_at,json=deletedAt,stdtime" json:"deleted_at,omitempty"` Title string `protobuf:"bytes,20,opt,name=title,proto3" json:"title,omitempty"` Topic string `protobuf:"bytes,21,opt,name=topic,proto3" json:"topic,omitempty"` Members []*ConversationMember `protobuf:"bytes,100,rep,name=members" json:"members,omitempty"` @@ -74,7 +73,7 @@ func (m *Conversation) Reset() { *m = Conversation{} } func (m *Conversation) String() string { return proto.CompactTextString(m) } func (*Conversation) ProtoMessage() {} func (*Conversation) Descriptor() ([]byte, []int) { - return fileDescriptor_conversation_da9fecc99e247077, []int{0} + return fileDescriptor_conversation_449f60adfd7d84bd, []int{0} } func (m *Conversation) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -124,13 +123,6 @@ func (m *Conversation) GetUpdatedAt() time.Time { return time.Time{} } -func (m *Conversation) GetDeletedAt() *time.Time { - if m != nil { - return m.DeletedAt - } - return nil -} - func (m *Conversation) GetTitle() string { if m != nil { return m.Title @@ -156,7 +148,6 @@ type ConversationMember struct { ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty" gorm:"primary_key"` CreatedAt time.Time `protobuf:"bytes,2,opt,name=created_at,json=createdAt,stdtime" json:"created_at"` UpdatedAt time.Time `protobuf:"bytes,3,opt,name=updated_at,json=updatedAt,stdtime" json:"updated_at"` - DeletedAt *time.Time `protobuf:"bytes,4,opt,name=deleted_at,json=deletedAt,stdtime" json:"deleted_at,omitempty"` Status ConversationMember_Status `protobuf:"varint,10,opt,name=status,proto3,enum=berty.entity.ConversationMember_Status" json:"status,omitempty"` Contact *Contact `protobuf:"bytes,100,opt,name=contact" json:"contact,omitempty"` ConversationID string `protobuf:"bytes,101,opt,name=conversation_id,json=conversationId,proto3" json:"conversation_id,omitempty"` @@ -170,7 +161,7 @@ func (m *ConversationMember) Reset() { *m = ConversationMember{} } func (m *ConversationMember) String() string { return proto.CompactTextString(m) } func (*ConversationMember) ProtoMessage() {} func (*ConversationMember) Descriptor() ([]byte, []int) { - return fileDescriptor_conversation_da9fecc99e247077, []int{1} + return fileDescriptor_conversation_449f60adfd7d84bd, []int{1} } func (m *ConversationMember) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -220,13 +211,6 @@ func (m *ConversationMember) GetUpdatedAt() time.Time { return time.Time{} } -func (m *ConversationMember) GetDeletedAt() *time.Time { - if m != nil { - return m.DeletedAt - } - return nil -} - func (m *ConversationMember) GetStatus() ConversationMember_Status { if m != nil { return m.Status @@ -297,16 +281,6 @@ func (m *Conversation) MarshalTo(dAtA []byte) (int, error) { return 0, err } i += n2 - if m.DeletedAt != nil { - dAtA[i] = 0x22 - i++ - i = encodeVarintConversation(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdTime(*m.DeletedAt))) - n3, err := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.DeletedAt, dAtA[i:]) - if err != nil { - return 0, err - } - i += n3 - } if len(m.Title) > 0 { dAtA[i] = 0xa2 i++ @@ -367,29 +341,19 @@ func (m *ConversationMember) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0x12 i++ i = encodeVarintConversation(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdTime(m.CreatedAt))) - n4, err := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.CreatedAt, dAtA[i:]) + n3, err := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.CreatedAt, dAtA[i:]) if err != nil { return 0, err } - i += n4 + i += n3 dAtA[i] = 0x1a i++ i = encodeVarintConversation(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdTime(m.UpdatedAt))) - n5, err := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.UpdatedAt, dAtA[i:]) + n4, err := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.UpdatedAt, dAtA[i:]) if err != nil { return 0, err } - i += n5 - if m.DeletedAt != nil { - dAtA[i] = 0x22 - i++ - i = encodeVarintConversation(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdTime(*m.DeletedAt))) - n6, err := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.DeletedAt, dAtA[i:]) - if err != nil { - return 0, err - } - i += n6 - } + i += n4 if m.Status != 0 { dAtA[i] = 0x50 i++ @@ -401,11 +365,11 @@ func (m *ConversationMember) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0x6 i++ i = encodeVarintConversation(dAtA, i, uint64(m.Contact.Size())) - n7, err := m.Contact.MarshalTo(dAtA[i:]) + n5, err := m.Contact.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n7 + i += n5 } if len(m.ConversationID) > 0 { dAtA[i] = 0xaa @@ -452,10 +416,6 @@ func (m *Conversation) Size() (n int) { n += 1 + l + sovConversation(uint64(l)) l = github_com_gogo_protobuf_types.SizeOfStdTime(m.UpdatedAt) n += 1 + l + sovConversation(uint64(l)) - if m.DeletedAt != nil { - l = github_com_gogo_protobuf_types.SizeOfStdTime(*m.DeletedAt) - n += 1 + l + sovConversation(uint64(l)) - } l = len(m.Title) if l > 0 { n += 2 + l + sovConversation(uint64(l)) @@ -490,10 +450,6 @@ func (m *ConversationMember) Size() (n int) { n += 1 + l + sovConversation(uint64(l)) l = github_com_gogo_protobuf_types.SizeOfStdTime(m.UpdatedAt) n += 1 + l + sovConversation(uint64(l)) - if m.DeletedAt != nil { - l = github_com_gogo_protobuf_types.SizeOfStdTime(*m.DeletedAt) - n += 1 + l + sovConversation(uint64(l)) - } if m.Status != 0 { n += 1 + sovConversation(uint64(m.Status)) } @@ -646,39 +602,6 @@ func (m *Conversation) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field DeletedAt", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowConversation - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthConversation - } - postIndex := iNdEx + msglen - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.DeletedAt == nil { - m.DeletedAt = new(time.Time) - } - if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(m.DeletedAt, dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex case 20: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Title", wireType) @@ -908,39 +831,6 @@ func (m *ConversationMember) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field DeletedAt", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowConversation - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthConversation - } - postIndex := iNdEx + msglen - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.DeletedAt == nil { - m.DeletedAt = new(time.Time) - } - if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(m.DeletedAt, dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex case 10: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field Status", wireType) @@ -1179,41 +1069,40 @@ var ( ) func init() { - proto.RegisterFile("entity/conversation.proto", fileDescriptor_conversation_da9fecc99e247077) + proto.RegisterFile("entity/conversation.proto", fileDescriptor_conversation_449f60adfd7d84bd) } -var fileDescriptor_conversation_da9fecc99e247077 = []byte{ - // 506 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x53, 0xc1, 0x6e, 0xd3, 0x4a, - 0x14, 0x8d, 0x9d, 0x34, 0x79, 0xb9, 0xe9, 0x0b, 0xd1, 0x28, 0x45, 0x6e, 0x16, 0xb1, 0xe5, 0x0d, - 0x59, 0x20, 0x1b, 0x85, 0x15, 0x65, 0x51, 0x25, 0xcd, 0x26, 0x0b, 0x84, 0x64, 0x60, 0xc3, 0x26, - 0x72, 0x3c, 0x53, 0x77, 0x94, 0xd8, 0x63, 0x26, 0x37, 0xad, 0xf2, 0x17, 0x2c, 0xf9, 0x05, 0xfe, - 0xa4, 0x4b, 0xbe, 0xc0, 0x54, 0xe6, 0x07, 0x10, 0xfc, 0x00, 0xb2, 0x3d, 0x56, 0x2d, 0x75, 0x51, - 0xb1, 0x66, 0xe5, 0x99, 0x7b, 0xcf, 0x39, 0xf7, 0xdc, 0x63, 0x1b, 0x4e, 0x59, 0x8c, 0x1c, 0x0f, - 0x6e, 0x20, 0xe2, 0x6b, 0x26, 0x77, 0x3e, 0x72, 0x11, 0x3b, 0x89, 0x14, 0x28, 0xc8, 0xf1, 0x9a, - 0x49, 0x3c, 0x38, 0x25, 0x60, 0x64, 0xfb, 0x09, 0x77, 0x8b, 0xc6, 0x7a, 0x7f, 0xe9, 0x86, 0xd2, - 0x4f, 0xae, 0x3e, 0x6d, 0xab, 0x67, 0xc9, 0x18, 0x0d, 0x43, 0x11, 0x8a, 0xe2, 0xe8, 0xe6, 0x27, - 0x55, 0x35, 0x43, 0x21, 0xc2, 0x2d, 0xbb, 0x27, 0x23, 0x8f, 0xd8, 0x0e, 0xfd, 0x28, 0xa9, 0x68, - 0xf7, 0x1e, 0xd0, 0x0f, 0xb0, 0xac, 0xda, 0xbf, 0x75, 0x38, 0xbe, 0xa8, 0xb9, 0x22, 0x2f, 0x40, - 0xe7, 0xd4, 0xd0, 0x2c, 0x6d, 0xd2, 0x9d, 0x5b, 0x77, 0x3f, 0x4f, 0xb5, 0x2c, 0x35, 0xf5, 0xe5, - 0xe2, 0x57, 0x6a, 0x92, 0x50, 0xc8, 0xe8, 0xcc, 0x4e, 0x24, 0x8f, 0x7c, 0x79, 0x58, 0x6d, 0xd8, - 0xc1, 0xf6, 0x74, 0x4e, 0xc9, 0x05, 0x40, 0x20, 0x99, 0x8f, 0x8c, 0xae, 0x7c, 0x34, 0x74, 0x4b, - 0x9b, 0xf4, 0xa6, 0x23, 0xa7, 0xb4, 0xe3, 0x54, 0x76, 0x9c, 0xf7, 0x95, 0x9d, 0xf9, 0x7f, 0xb7, - 0xa9, 0xd9, 0xf8, 0xfc, 0xdd, 0xd4, 0xbc, 0xae, 0xe2, 0xcd, 0x30, 0x17, 0xd9, 0x27, 0xb4, 0x12, - 0x69, 0xfe, 0x8d, 0x88, 0xe2, 0xcd, 0x90, 0x9c, 0x03, 0x50, 0xb6, 0x65, 0x4a, 0xa4, 0xf5, 0xa8, - 0x48, 0xab, 0x14, 0x50, 0x9c, 0x19, 0x92, 0x21, 0x1c, 0x21, 0xc7, 0x2d, 0x33, 0x86, 0xf9, 0xfe, - 0x5e, 0x79, 0x29, 0xaa, 0x22, 0xe1, 0x81, 0x71, 0xa2, 0xaa, 0xf9, 0x85, 0x9c, 0x41, 0x27, 0x62, - 0xd1, 0x9a, 0xc9, 0x9d, 0x41, 0xad, 0xe6, 0xa4, 0x37, 0xb5, 0x9c, 0xfa, 0xab, 0x74, 0xea, 0xa9, - 0xbe, 0x29, 0x80, 0x5e, 0x45, 0xb0, 0xbf, 0xb6, 0x80, 0x3c, 0xec, 0xff, 0xdb, 0xd9, 0x9f, 0x43, - 0x7b, 0x87, 0x3e, 0xee, 0x77, 0x06, 0x58, 0xda, 0xa4, 0x3f, 0x7d, 0xf6, 0x58, 0x9c, 0xce, 0xbb, - 0x02, 0xee, 0x29, 0x1a, 0x71, 0xa1, 0xa3, 0xbe, 0x6d, 0x83, 0x16, 0xe3, 0x4f, 0x1e, 0x28, 0xe4, - 0x4d, 0xaf, 0x42, 0x91, 0xd7, 0xf0, 0xa4, 0xfe, 0x43, 0xae, 0x38, 0x35, 0x58, 0x91, 0x3d, 0xc9, - 0x52, 0xb3, 0x5f, 0x1f, 0xb8, 0x5c, 0x78, 0xfd, 0x3a, 0x74, 0x49, 0xc9, 0x73, 0x00, 0xa5, 0x93, - 0xf3, 0x2e, 0x0b, 0xde, 0xff, 0x59, 0x6a, 0x76, 0xd5, 0x98, 0xe5, 0xc2, 0xeb, 0x2a, 0xc0, 0x92, - 0xda, 0xaf, 0xa0, 0x5d, 0xba, 0x25, 0x3d, 0xe8, 0x7c, 0x88, 0x37, 0xb1, 0xb8, 0x89, 0x07, 0x0d, - 0xd2, 0x85, 0xa3, 0xb7, 0x37, 0x31, 0x93, 0x03, 0x8d, 0x00, 0xb4, 0x67, 0x01, 0xf2, 0x6b, 0x36, - 0xd0, 0x73, 0xcc, 0x7c, 0x2b, 0x82, 0x0d, 0xa3, 0x83, 0xe6, 0x7c, 0x72, 0x9b, 0x8d, 0xb5, 0x6f, - 0xd9, 0x58, 0xbb, 0xcb, 0xc6, 0xda, 0x97, 0x1f, 0xe3, 0xc6, 0xc7, 0xa7, 0xe5, 0x5a, 0xc8, 0x82, - 0x2b, 0x37, 0x10, 0x92, 0xb9, 0xe5, 0x82, 0xeb, 0x76, 0x11, 0xf3, 0xcb, 0x3f, 0x01, 0x00, 0x00, - 0xff, 0xff, 0x58, 0x49, 0xc7, 0x78, 0x6e, 0x04, 0x00, 0x00, +var fileDescriptor_conversation_449f60adfd7d84bd = []byte{ + // 489 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x93, 0x3f, 0x6f, 0xd3, 0x40, + 0x18, 0xc6, 0x73, 0x8e, 0x9a, 0x90, 0x37, 0x25, 0x44, 0xa7, 0x14, 0xb9, 0x19, 0x62, 0xcb, 0x0b, + 0x19, 0x90, 0x8d, 0xc2, 0x44, 0x19, 0x50, 0xd2, 0x2c, 0x19, 0x10, 0x92, 0x81, 0x85, 0x25, 0x72, + 0x7c, 0x57, 0xf7, 0x94, 0xd8, 0x67, 0xce, 0x6f, 0x5a, 0xe5, 0x5b, 0x30, 0xf2, 0x39, 0xf8, 0x14, + 0x1d, 0xf9, 0x04, 0xa6, 0x32, 0x0b, 0x23, 0xe2, 0x13, 0x20, 0xff, 0x53, 0x2d, 0x75, 0x40, 0x8c, + 0x9d, 0x7c, 0xf7, 0xbe, 0xcf, 0xef, 0xbd, 0xe7, 0x1e, 0xdb, 0x70, 0xca, 0x23, 0x14, 0x78, 0x70, + 0x7c, 0x19, 0x5d, 0x71, 0x95, 0x78, 0x28, 0x64, 0x64, 0xc7, 0x4a, 0xa2, 0xa4, 0xc7, 0x1b, 0xae, + 0xf0, 0x60, 0x97, 0x82, 0xb1, 0xe5, 0xc5, 0xc2, 0x29, 0x1a, 0x9b, 0xfd, 0x85, 0x13, 0x28, 0x2f, + 0xbe, 0xfc, 0xbc, 0xab, 0x9f, 0x25, 0x31, 0x1e, 0x05, 0x32, 0x90, 0xc5, 0xd2, 0xc9, 0x57, 0x55, + 0xd5, 0x08, 0xa4, 0x0c, 0x76, 0xfc, 0x0e, 0x46, 0x11, 0xf2, 0x04, 0xbd, 0x30, 0xae, 0xb1, 0x3b, + 0x0f, 0xe8, 0xf9, 0x58, 0x56, 0xad, 0x6f, 0x1a, 0x1c, 0x9f, 0x37, 0x5c, 0xd1, 0x17, 0xa0, 0x09, + 0xa6, 0x13, 0x93, 0x4c, 0x7b, 0x0b, 0xf3, 0xf6, 0xf7, 0x29, 0xc9, 0x52, 0x43, 0x5b, 0x2d, 0xff, + 0xa4, 0x06, 0x0d, 0xa4, 0x0a, 0xcf, 0xac, 0x58, 0x89, 0xd0, 0x53, 0x87, 0xf5, 0x96, 0x1f, 0x2c, + 0x57, 0x13, 0x8c, 0x9e, 0x03, 0xf8, 0x8a, 0x7b, 0xc8, 0xd9, 0xda, 0x43, 0x5d, 0x33, 0xc9, 0xb4, + 0x3f, 0x1b, 0xdb, 0xa5, 0x1d, 0xbb, 0xb6, 0x63, 0x7f, 0xa8, 0xed, 0x2c, 0x1e, 0xdd, 0xa4, 0x46, + 0xeb, 0xcb, 0x0f, 0x83, 0xb8, 0xbd, 0x8a, 0x9b, 0x63, 0x3e, 0x64, 0x1f, 0xb3, 0x7a, 0x48, 0xfb, + 0x7f, 0x86, 0x54, 0xdc, 0x1c, 0xe9, 0x08, 0x8e, 0x50, 0xe0, 0x8e, 0xeb, 0xa3, 0xdc, 0xbe, 0x5b, + 0x6e, 0x8a, 0xaa, 0x8c, 0x85, 0xaf, 0x9f, 0x54, 0xd5, 0x7c, 0x43, 0xcf, 0xa0, 0x1b, 0xf2, 0x70, + 0xc3, 0x55, 0xa2, 0x33, 0xb3, 0x3d, 0xed, 0xcf, 0x4c, 0xbb, 0xf9, 0x26, 0xec, 0x66, 0x28, 0x6f, + 0x0b, 0xa1, 0x5b, 0x03, 0xd6, 0xaf, 0x36, 0xd0, 0xfb, 0xfd, 0x07, 0x1d, 0xdd, 0x1b, 0xe8, 0x24, + 0xe8, 0xe1, 0x3e, 0xd1, 0xc1, 0x24, 0xd3, 0xc1, 0xec, 0xd9, 0xbf, 0xd2, 0xb0, 0xdf, 0x17, 0x72, + 0xb7, 0xc2, 0xa8, 0x03, 0xdd, 0xea, 0xcb, 0xd2, 0x59, 0x61, 0xe1, 0xe4, 0xde, 0x84, 0xbc, 0xe9, + 0xd6, 0x2a, 0xfa, 0x1a, 0x9e, 0x34, 0x7f, 0x87, 0xb5, 0x60, 0x3a, 0x2f, 0xa2, 0xa3, 0x59, 0x6a, + 0x0c, 0x9a, 0x07, 0xae, 0x96, 0xee, 0xa0, 0x29, 0x5d, 0x31, 0xfa, 0x1c, 0xa0, 0x9a, 0x93, 0x73, + 0x17, 0x05, 0xf7, 0x38, 0x4b, 0x8d, 0x5e, 0x75, 0xcc, 0x6a, 0xe9, 0xf6, 0x2a, 0xc1, 0x8a, 0x59, + 0xaf, 0xa0, 0x53, 0xba, 0xa5, 0x7d, 0xe8, 0x7e, 0x8c, 0xb6, 0x91, 0xbc, 0x8e, 0x86, 0x2d, 0xda, + 0x83, 0xa3, 0x77, 0xd7, 0x11, 0x57, 0x43, 0x42, 0x01, 0x3a, 0x73, 0x1f, 0xc5, 0x15, 0x1f, 0x6a, + 0xb9, 0x66, 0xb1, 0x93, 0xfe, 0x96, 0xb3, 0x61, 0x7b, 0x31, 0xbd, 0xc9, 0x26, 0xe4, 0x7b, 0x36, + 0x21, 0xb7, 0xd9, 0x84, 0x7c, 0xfd, 0x39, 0x69, 0x7d, 0x7a, 0x5a, 0x5e, 0x0b, 0xb9, 0x7f, 0xe9, + 0xf8, 0x52, 0x71, 0xa7, 0xbc, 0xe0, 0xa6, 0x53, 0x44, 0xfd, 0xf2, 0x6f, 0x00, 0x00, 0x00, 0xff, + 0xff, 0x62, 0x60, 0x6d, 0x95, 0xec, 0x03, 0x00, 0x00, } diff --git a/core/entity/conversation.proto b/core/entity/conversation.proto index 0e3efdf2b1..c429503476 100644 --- a/core/entity/conversation.proto +++ b/core/entity/conversation.proto @@ -17,7 +17,6 @@ message Conversation { string id = 1 [(gql.graphql_id) = true, (gogoproto.moretags) = "gorm:\"primary_key\"", (gogoproto.customname) = "ID"]; google.protobuf.Timestamp created_at = 2 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false]; google.protobuf.Timestamp updated_at = 3 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false]; - google.protobuf.Timestamp deleted_at = 4 [(gogoproto.stdtime) = true]; // // metadata @@ -41,7 +40,6 @@ message ConversationMember { string id = 1 [(gql.graphql_id) = true, (gogoproto.moretags) = "gorm:\"primary_key\"", (gogoproto.customname) = "ID"]; google.protobuf.Timestamp created_at = 2 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false]; google.protobuf.Timestamp updated_at = 3 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false]; - google.protobuf.Timestamp deleted_at = 4 [(gogoproto.stdtime) = true]; enum Status { Unknown = 0; diff --git a/core/entity/device.pb.go b/core/entity/device.pb.go index 5fa128863c..4093df7ab4 100644 --- a/core/entity/device.pb.go +++ b/core/entity/device.pb.go @@ -57,14 +57,13 @@ func (x Device_Status) String() string { return proto.EnumName(Device_Status_name, int32(x)) } func (Device_Status) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_device_75d58e7b8a5b562b, []int{0, 0} + return fileDescriptor_device_8edb5c9c2a343bb3, []int{0, 0} } type Device struct { ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty" gorm:"primary_key"` CreatedAt time.Time `protobuf:"bytes,2,opt,name=created_at,json=createdAt,stdtime" json:"created_at"` UpdatedAt time.Time `protobuf:"bytes,3,opt,name=updated_at,json=updatedAt,stdtime" json:"updated_at"` - DeletedAt *time.Time `protobuf:"bytes,4,opt,name=deleted_at,json=deletedAt,stdtime" json:"deleted_at,omitempty"` Name string `protobuf:"bytes,5,opt,name=name,proto3" json:"name,omitempty"` Status Device_Status `protobuf:"varint,10,opt,name=status,proto3,enum=berty.entity.Device_Status" json:"status,omitempty"` ApiVersion uint32 `protobuf:"varint,11,opt,name=api_version,json=apiVersion,proto3" json:"api_version,omitempty"` @@ -78,7 +77,7 @@ func (m *Device) Reset() { *m = Device{} } func (m *Device) String() string { return proto.CompactTextString(m) } func (*Device) ProtoMessage() {} func (*Device) Descriptor() ([]byte, []int) { - return fileDescriptor_device_75d58e7b8a5b562b, []int{0} + return fileDescriptor_device_8edb5c9c2a343bb3, []int{0} } func (m *Device) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -128,13 +127,6 @@ func (m *Device) GetUpdatedAt() time.Time { return time.Time{} } -func (m *Device) GetDeletedAt() *time.Time { - if m != nil { - return m.DeletedAt - } - return nil -} - func (m *Device) GetName() string { if m != nil { return m.Name @@ -204,16 +196,6 @@ func (m *Device) MarshalTo(dAtA []byte) (int, error) { return 0, err } i += n2 - if m.DeletedAt != nil { - dAtA[i] = 0x22 - i++ - i = encodeVarintDevice(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdTime(*m.DeletedAt))) - n3, err := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.DeletedAt, dAtA[i:]) - if err != nil { - return 0, err - } - i += n3 - } if len(m.Name) > 0 { dAtA[i] = 0x2a i++ @@ -265,10 +247,6 @@ func (m *Device) Size() (n int) { n += 1 + l + sovDevice(uint64(l)) l = github_com_gogo_protobuf_types.SizeOfStdTime(m.UpdatedAt) n += 1 + l + sovDevice(uint64(l)) - if m.DeletedAt != nil { - l = github_com_gogo_protobuf_types.SizeOfStdTime(*m.DeletedAt) - n += 1 + l + sovDevice(uint64(l)) - } l = len(m.Name) if l > 0 { n += 1 + l + sovDevice(uint64(l)) @@ -420,39 +398,6 @@ func (m *Device) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field DeletedAt", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDevice - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDevice - } - postIndex := iNdEx + msglen - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.DeletedAt == nil { - m.DeletedAt = new(time.Time) - } - if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(m.DeletedAt, dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex case 5: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Name", wireType) @@ -676,36 +621,35 @@ var ( ErrIntOverflowDevice = fmt.Errorf("proto: integer overflow") ) -func init() { proto.RegisterFile("entity/device.proto", fileDescriptor_device_75d58e7b8a5b562b) } +func init() { proto.RegisterFile("entity/device.proto", fileDescriptor_device_8edb5c9c2a343bb3) } -var fileDescriptor_device_75d58e7b8a5b562b = []byte{ - // 442 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x51, 0xbd, 0x8e, 0xd3, 0x4c, - 0x14, 0xcd, 0x38, 0xf9, 0xfc, 0x91, 0x9b, 0x04, 0x59, 0x03, 0x42, 0x26, 0x48, 0xb1, 0xe5, 0xca, - 0x42, 0xc8, 0x46, 0xbb, 0x1d, 0x0d, 0x4a, 0x36, 0x4d, 0x0a, 0x0a, 0xcc, 0x4f, 0x41, 0x13, 0x4d, - 0xec, 0xbb, 0xde, 0xd1, 0xda, 0x1e, 0x33, 0x9e, 0x04, 0xf9, 0x2d, 0x28, 0x79, 0xa4, 0x2d, 0x79, - 0x82, 0xb0, 0x32, 0x2f, 0xb0, 0xe2, 0x09, 0x90, 0x3d, 0x0e, 0xd0, 0x21, 0xaa, 0xb9, 0x3a, 0xf7, - 0xfc, 0xe8, 0x9e, 0x81, 0x07, 0x58, 0x28, 0xae, 0xea, 0x30, 0xc1, 0x03, 0x8f, 0x31, 0x28, 0xa5, - 0x50, 0x82, 0x4e, 0x77, 0x28, 0x55, 0x1d, 0xe8, 0xd5, 0xdc, 0x63, 0x25, 0x0f, 0xbb, 0xc5, 0x6e, - 0x7f, 0x19, 0xa6, 0x92, 0x95, 0x57, 0x1f, 0xb3, 0xd3, 0xab, 0x15, 0xf3, 0x87, 0xa9, 0x48, 0x45, - 0x37, 0x86, 0xed, 0xd4, 0xa3, 0x4e, 0x2a, 0x44, 0x9a, 0xe1, 0x6f, 0xb1, 0xe2, 0x39, 0x56, 0x8a, - 0xe5, 0xa5, 0x26, 0x78, 0x77, 0x43, 0x30, 0xd7, 0x5d, 0x32, 0x7d, 0x0e, 0x06, 0x4f, 0x6c, 0xe2, - 0x12, 0x7f, 0xbc, 0x72, 0x6f, 0xef, 0x1e, 0x93, 0xe6, 0xe8, 0x18, 0x9b, 0xf5, 0x8f, 0xa3, 0x43, - 0x53, 0x21, 0xf3, 0x17, 0x5e, 0x29, 0x79, 0xce, 0x64, 0xbd, 0xbd, 0xc6, 0xda, 0x8b, 0x0c, 0x9e, - 0xd0, 0x0b, 0x80, 0x58, 0x22, 0x53, 0x98, 0x6c, 0x99, 0xb2, 0x0d, 0x97, 0xf8, 0x93, 0xb3, 0x79, - 0xa0, 0x23, 0x83, 0x53, 0x64, 0xf0, 0xf6, 0x14, 0xb9, 0xba, 0x77, 0x73, 0x74, 0x06, 0x9f, 0xbf, - 0x39, 0x24, 0x1a, 0xf7, 0xba, 0xa5, 0x6a, 0x4d, 0xf6, 0x65, 0x72, 0x32, 0x19, 0xfe, 0x8b, 0x49, - 0xaf, 0x5b, 0x2a, 0xfa, 0x12, 0x20, 0xc1, 0x0c, 0x7b, 0x93, 0xd1, 0x5f, 0x4d, 0x46, 0xda, 0xa0, - 0xd7, 0x2c, 0x15, 0xa5, 0x30, 0x2a, 0x58, 0x8e, 0xf6, 0x7f, 0xed, 0xf9, 0x51, 0x37, 0xd3, 0x73, - 0x30, 0x2b, 0xc5, 0xd4, 0xbe, 0xb2, 0xc1, 0x25, 0xfe, 0xfd, 0xb3, 0x27, 0xc1, 0x9f, 0xbf, 0x12, - 0xe8, 0xda, 0x82, 0x37, 0x1d, 0x25, 0xea, 0xa9, 0xd4, 0x81, 0x09, 0x2b, 0xf9, 0xf6, 0x80, 0xb2, - 0xe2, 0xa2, 0xb0, 0x27, 0x2e, 0xf1, 0x67, 0x11, 0xb0, 0x92, 0xbf, 0xd7, 0x08, 0x7d, 0x06, 0x10, - 0x8b, 0x42, 0xb1, 0x58, 0x6d, 0x79, 0x62, 0x4f, 0xbb, 0xba, 0x67, 0xcd, 0xd1, 0x19, 0x5f, 0x68, - 0x74, 0xb3, 0x8e, 0xc6, 0x3d, 0x61, 0x93, 0x78, 0xaf, 0xc1, 0xd4, 0x01, 0x74, 0x02, 0xff, 0xbf, - 0x2b, 0xae, 0x0b, 0xf1, 0xa9, 0xb0, 0x06, 0x74, 0x06, 0x2d, 0xbd, 0xc0, 0x58, 0x61, 0x62, 0x11, - 0x6a, 0xc1, 0x74, 0xcd, 0xab, 0xf8, 0x17, 0x62, 0xb4, 0x84, 0xe5, 0x81, 0xf1, 0x8c, 0xed, 0x32, - 0xb4, 0x86, 0x14, 0xc0, 0x7c, 0x55, 0x57, 0x98, 0x5d, 0x5a, 0x4f, 0x57, 0xfe, 0x4d, 0xb3, 0x20, - 0x5f, 0x9b, 0x05, 0xb9, 0x6d, 0x16, 0xe4, 0xcb, 0xf7, 0xc5, 0xe0, 0xc3, 0x23, 0x7d, 0x97, 0xc2, - 0xf8, 0x2a, 0x8c, 0x85, 0xc4, 0x50, 0x5f, 0xb8, 0x33, 0xbb, 0xe6, 0xce, 0x7f, 0x06, 0x00, 0x00, - 0xff, 0xff, 0xca, 0x66, 0xae, 0x41, 0xa3, 0x02, 0x00, 0x00, +var fileDescriptor_device_8edb5c9c2a343bb3 = []byte{ + // 426 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x90, 0xbf, 0x8e, 0xd3, 0x40, + 0x10, 0xc6, 0xb3, 0x0e, 0x18, 0x32, 0x49, 0x90, 0xb5, 0x20, 0x64, 0x82, 0x14, 0x5b, 0xae, 0x2c, + 0x84, 0x6c, 0x74, 0xd7, 0xd1, 0x25, 0x97, 0x26, 0x05, 0x05, 0xe6, 0x4f, 0x41, 0x13, 0x6d, 0xec, + 0x39, 0xdf, 0xea, 0x6c, 0xaf, 0x59, 0x6f, 0x82, 0xfc, 0x16, 0x94, 0xbc, 0x05, 0xaf, 0x71, 0x25, + 0x4f, 0x10, 0x4e, 0xe6, 0x05, 0x10, 0x4f, 0x80, 0xec, 0xb5, 0x81, 0x96, 0x6a, 0x47, 0xdf, 0xfc, + 0xbe, 0xf9, 0x76, 0x06, 0x1e, 0x62, 0xa1, 0xb8, 0xaa, 0xc3, 0x04, 0x8f, 0x3c, 0xc6, 0xa0, 0x94, + 0x42, 0x09, 0x3a, 0xdb, 0xa3, 0x54, 0x75, 0xa0, 0x5b, 0x0b, 0x8f, 0x95, 0x3c, 0xec, 0x1a, 0xfb, + 0xc3, 0x65, 0x98, 0x4a, 0x56, 0x5e, 0x7d, 0xcc, 0x86, 0x57, 0x3b, 0x16, 0x8f, 0x52, 0x91, 0x8a, + 0xae, 0x0c, 0xdb, 0xaa, 0x57, 0x9d, 0x54, 0x88, 0x34, 0xc3, 0xbf, 0x66, 0xc5, 0x73, 0xac, 0x14, + 0xcb, 0x4b, 0x0d, 0x78, 0x5f, 0xc7, 0x60, 0x6e, 0xba, 0x64, 0xfa, 0x02, 0x0c, 0x9e, 0xd8, 0xc4, + 0x25, 0xfe, 0x64, 0xed, 0xde, 0xfe, 0x7c, 0x42, 0x9a, 0x93, 0x63, 0x6c, 0x37, 0xbf, 0x4e, 0x0e, + 0x4d, 0x85, 0xcc, 0x5f, 0x7a, 0xa5, 0xe4, 0x39, 0x93, 0xf5, 0xee, 0x1a, 0x6b, 0x2f, 0x32, 0x78, + 0x42, 0x2f, 0x00, 0x62, 0x89, 0x4c, 0x61, 0xb2, 0x63, 0xca, 0x36, 0x5c, 0xe2, 0x4f, 0xcf, 0x16, + 0x81, 0x8e, 0x0c, 0x86, 0xc8, 0xe0, 0xed, 0x10, 0xb9, 0xbe, 0x7f, 0x73, 0x72, 0x46, 0x9f, 0xbf, + 0x3b, 0x24, 0x9a, 0xf4, 0xbe, 0x95, 0x6a, 0x87, 0x1c, 0xca, 0x64, 0x18, 0x32, 0xfe, 0x9f, 0x21, + 0xbd, 0x6f, 0xa5, 0x28, 0x85, 0x3b, 0x05, 0xcb, 0xd1, 0xbe, 0xdb, 0xfe, 0x3e, 0xea, 0x6a, 0x7a, + 0x0e, 0x66, 0xa5, 0x98, 0x3a, 0x54, 0x36, 0xb8, 0xc4, 0x7f, 0x70, 0xf6, 0x34, 0xf8, 0xf7, 0xa8, + 0x81, 0xde, 0x3a, 0x78, 0xd3, 0x21, 0x51, 0x8f, 0x52, 0x07, 0xa6, 0xac, 0xe4, 0xbb, 0x23, 0xca, + 0x8a, 0x8b, 0xc2, 0x9e, 0xba, 0xc4, 0x9f, 0x47, 0xc0, 0x4a, 0xfe, 0x5e, 0x2b, 0xf4, 0x39, 0x40, + 0x2c, 0x0a, 0xc5, 0x62, 0xb5, 0xe3, 0x89, 0x3d, 0xeb, 0xae, 0x35, 0x6f, 0x4e, 0xce, 0xe4, 0x42, + 0xab, 0xdb, 0x4d, 0x34, 0xe9, 0x81, 0x6d, 0xe2, 0xbd, 0x06, 0x53, 0x07, 0xd0, 0x29, 0xdc, 0x7b, + 0x57, 0x5c, 0x17, 0xe2, 0x53, 0x61, 0x8d, 0xe8, 0x1c, 0x5a, 0xbc, 0xc0, 0x58, 0x61, 0x62, 0x11, + 0x6a, 0xc1, 0x6c, 0xc3, 0xab, 0xf8, 0x8f, 0x62, 0xb4, 0xc0, 0xea, 0xc8, 0x78, 0xc6, 0xf6, 0x19, + 0x5a, 0x63, 0x0a, 0x60, 0xbe, 0xaa, 0x2b, 0xcc, 0x2e, 0xad, 0x67, 0x6b, 0xff, 0xa6, 0x59, 0x92, + 0x6f, 0xcd, 0x92, 0xdc, 0x36, 0x4b, 0xf2, 0xe5, 0xc7, 0x72, 0xf4, 0xe1, 0xb1, 0xde, 0x4b, 0x61, + 0x7c, 0x15, 0xc6, 0x42, 0x62, 0xa8, 0x37, 0xdc, 0x9b, 0xdd, 0xf5, 0xce, 0x7f, 0x07, 0x00, 0x00, + 0xff, 0xff, 0x30, 0x51, 0xb0, 0x52, 0x62, 0x02, 0x00, 0x00, } diff --git a/core/entity/device.proto b/core/entity/device.proto index a9babe0f00..b4710c8610 100644 --- a/core/entity/device.proto +++ b/core/entity/device.proto @@ -24,7 +24,6 @@ message Device { string id = 1 [(gql.graphql_id) = true, (gogoproto.moretags) = "gorm:\"primary_key\"", (gogoproto.customname) = "ID"]; google.protobuf.Timestamp created_at = 2 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false]; google.protobuf.Timestamp updated_at = 3 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false]; - google.protobuf.Timestamp deleted_at = 4 [(gogoproto.stdtime) = true]; // // metadata fields diff --git a/core/entity/sender_alias.pb.go b/core/entity/sender_alias.pb.go index de1724a9fa..bbddaa593f 100644 --- a/core/entity/sender_alias.pb.go +++ b/core/entity/sender_alias.pb.go @@ -53,14 +53,13 @@ func (x SenderAlias_Status) String() string { return proto.EnumName(SenderAlias_Status_name, int32(x)) } func (SenderAlias_Status) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_sender_alias_10fe8ce3e10f9b3b, []int{0, 0} + return fileDescriptor_sender_alias_ea804a9a8a5998cb, []int{0, 0} } type SenderAlias struct { ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty" gorm:"primary_key"` CreatedAt time.Time `protobuf:"bytes,2,opt,name=created_at,json=createdAt,stdtime" json:"created_at"` UpdatedAt time.Time `protobuf:"bytes,3,opt,name=updated_at,json=updatedAt,stdtime" json:"updated_at"` - DeletedAt *time.Time `protobuf:"bytes,4,opt,name=deleted_at,json=deletedAt,stdtime" json:"deleted_at,omitempty"` Status SenderAlias_Status `protobuf:"varint,5,opt,name=status,proto3,enum=berty.entity.SenderAlias_Status" json:"status,omitempty"` OriginDeviceID string `protobuf:"bytes,6,opt,name=origin_device_id,json=originDeviceId,proto3" json:"origin_device_id,omitempty"` ContactID string `protobuf:"bytes,7,opt,name=contact_id,json=contactId,proto3" json:"contact_id,omitempty"` @@ -76,7 +75,7 @@ func (m *SenderAlias) Reset() { *m = SenderAlias{} } func (m *SenderAlias) String() string { return proto.CompactTextString(m) } func (*SenderAlias) ProtoMessage() {} func (*SenderAlias) Descriptor() ([]byte, []int) { - return fileDescriptor_sender_alias_10fe8ce3e10f9b3b, []int{0} + return fileDescriptor_sender_alias_ea804a9a8a5998cb, []int{0} } func (m *SenderAlias) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -126,13 +125,6 @@ func (m *SenderAlias) GetUpdatedAt() time.Time { return time.Time{} } -func (m *SenderAlias) GetDeletedAt() *time.Time { - if m != nil { - return m.DeletedAt - } - return nil -} - func (m *SenderAlias) GetStatus() SenderAlias_Status { if m != nil { return m.Status @@ -216,16 +208,6 @@ func (m *SenderAlias) MarshalTo(dAtA []byte) (int, error) { return 0, err } i += n2 - if m.DeletedAt != nil { - dAtA[i] = 0x22 - i++ - i = encodeVarintSenderAlias(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdTime(*m.DeletedAt))) - n3, err := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.DeletedAt, dAtA[i:]) - if err != nil { - return 0, err - } - i += n3 - } if m.Status != 0 { dAtA[i] = 0x28 i++ @@ -294,10 +276,6 @@ func (m *SenderAlias) Size() (n int) { n += 1 + l + sovSenderAlias(uint64(l)) l = github_com_gogo_protobuf_types.SizeOfStdTime(m.UpdatedAt) n += 1 + l + sovSenderAlias(uint64(l)) - if m.DeletedAt != nil { - l = github_com_gogo_protobuf_types.SizeOfStdTime(*m.DeletedAt) - n += 1 + l + sovSenderAlias(uint64(l)) - } if m.Status != 0 { n += 1 + sovSenderAlias(uint64(m.Status)) } @@ -457,39 +435,6 @@ func (m *SenderAlias) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field DeletedAt", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowSenderAlias - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthSenderAlias - } - postIndex := iNdEx + msglen - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.DeletedAt == nil { - m.DeletedAt = new(time.Time) - } - if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(m.DeletedAt, dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex case 5: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field Status", wireType) @@ -773,40 +718,39 @@ var ( ) func init() { - proto.RegisterFile("entity/sender_alias.proto", fileDescriptor_sender_alias_10fe8ce3e10f9b3b) -} - -var fileDescriptor_sender_alias_10fe8ce3e10f9b3b = []byte{ - // 487 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x52, 0xcf, 0x8a, 0xd3, 0x40, - 0x18, 0xef, 0x74, 0x6b, 0xb7, 0xfd, 0xba, 0x76, 0xc3, 0x20, 0x12, 0x8b, 0x34, 0xa5, 0xa7, 0x0a, - 0x4b, 0x02, 0xeb, 0x45, 0x54, 0x90, 0x34, 0xc9, 0x21, 0x2c, 0x64, 0x21, 0x5d, 0x15, 0xbc, 0x84, - 0x34, 0x33, 0x1b, 0x07, 0xdb, 0x4c, 0x99, 0x4c, 0x17, 0xfa, 0x16, 0x1e, 0x7d, 0xa4, 0x3d, 0xfa, - 0x04, 0x51, 0xe2, 0xd1, 0x9b, 0x4f, 0x20, 0x99, 0xa4, 0x9a, 0x9b, 0x78, 0xfb, 0xe6, 0xfb, 0xfd, - 0xe3, 0xfb, 0x25, 0xf0, 0x84, 0x66, 0x92, 0xc9, 0x83, 0x95, 0xd3, 0x8c, 0x50, 0x11, 0xc5, 0x1b, - 0x16, 0xe7, 0xe6, 0x4e, 0x70, 0xc9, 0xf1, 0xd9, 0x9a, 0x0a, 0x79, 0x30, 0x6b, 0xc2, 0xe4, 0x51, - 0xca, 0x53, 0xae, 0x00, 0xab, 0x9a, 0x6a, 0xce, 0xc4, 0x48, 0x39, 0x4f, 0x37, 0xd4, 0x52, 0xaf, - 0xf5, 0xfe, 0xd6, 0x92, 0x6c, 0x4b, 0x73, 0x19, 0x6f, 0x77, 0x35, 0x61, 0xfe, 0xb3, 0x07, 0xa3, - 0x95, 0xf2, 0xb6, 0x2b, 0x6b, 0x7c, 0x01, 0x5d, 0x46, 0x74, 0x34, 0x43, 0x8b, 0xe1, 0xf2, 0x69, - 0x59, 0x18, 0x5d, 0xdf, 0xfd, 0x55, 0x18, 0x38, 0xe5, 0x62, 0xfb, 0x72, 0xbe, 0x13, 0x6c, 0x1b, - 0x8b, 0x43, 0xf4, 0x89, 0x1e, 0xe6, 0x61, 0x97, 0x11, 0xec, 0x00, 0x24, 0x82, 0xc6, 0x92, 0x92, - 0x28, 0x96, 0x7a, 0x77, 0x86, 0x16, 0xa3, 0xcb, 0x89, 0x59, 0x67, 0x9a, 0xc7, 0x4c, 0xf3, 0xe6, - 0x98, 0xb9, 0x1c, 0xdc, 0x17, 0x46, 0xe7, 0xf3, 0x37, 0x03, 0x85, 0xc3, 0x46, 0x67, 0xcb, 0xca, - 0x64, 0xbf, 0x23, 0x47, 0x93, 0x93, 0xff, 0x31, 0x69, 0x74, 0xb6, 0xc4, 0x6f, 0x00, 0x08, 0xdd, - 0xd0, 0xc6, 0xa4, 0xf7, 0x4f, 0x93, 0x5e, 0x6d, 0xd0, 0x68, 0x6c, 0x89, 0x5f, 0x40, 0x3f, 0x97, - 0xb1, 0xdc, 0xe7, 0xfa, 0x83, 0x19, 0x5a, 0x8c, 0x2f, 0x67, 0x66, 0xbb, 0x5e, 0xb3, 0xd5, 0x91, - 0xb9, 0x52, 0xbc, 0xb0, 0xe1, 0xe3, 0xd7, 0xa0, 0x71, 0xc1, 0x52, 0x96, 0x45, 0x84, 0xde, 0xb1, - 0x84, 0x46, 0x8c, 0xe8, 0x7d, 0x55, 0x20, 0x2e, 0x0b, 0x63, 0x7c, 0xad, 0x30, 0x57, 0x41, 0xbe, - 0x1b, 0x8e, 0x79, 0xfb, 0x4d, 0xf0, 0x05, 0x40, 0xc2, 0x33, 0x19, 0x27, 0xb2, 0xd2, 0x9d, 0x2a, - 0xdd, 0xc3, 0xb2, 0x30, 0x86, 0x4e, 0xbd, 0xf5, 0xdd, 0x70, 0xd8, 0x10, 0x7c, 0x82, 0x5f, 0xc1, - 0x79, 0xc2, 0xb3, 0x3b, 0x2a, 0xf2, 0x58, 0x32, 0x9e, 0x55, 0x92, 0xc1, 0xdf, 0x28, 0xa7, 0x05, - 0x55, 0x51, 0x6d, 0xaa, 0x4f, 0xf0, 0x33, 0xd0, 0xd4, 0xff, 0x13, 0x31, 0x52, 0x5d, 0x75, 0xcb, - 0xa8, 0xd0, 0x87, 0x95, 0x3a, 0x3c, 0x57, 0x7b, 0xff, 0xcf, 0x1a, 0x63, 0xe8, 0xed, 0x73, 0x4a, - 0x74, 0x98, 0xa1, 0xc5, 0x20, 0x54, 0xf3, 0xdc, 0x86, 0x7e, 0x7d, 0x39, 0x1e, 0xc1, 0xe9, 0xdb, - 0xe0, 0x2a, 0xb8, 0x7e, 0x1f, 0x68, 0x1d, 0x3c, 0x80, 0xde, 0xca, 0x0b, 0x6e, 0x34, 0x84, 0x31, - 0x8c, 0xab, 0x29, 0xb2, 0x03, 0x37, 0xb2, 0x9d, 0x2b, 0xcf, 0xd5, 0xba, 0xf8, 0x0c, 0x06, 0xa1, - 0xe7, 0x78, 0xfe, 0x3b, 0xcf, 0xd5, 0x4e, 0x96, 0x8b, 0xfb, 0x72, 0x8a, 0xbe, 0x96, 0x53, 0xf4, - 0xbd, 0x9c, 0xa2, 0x2f, 0x3f, 0xa6, 0x9d, 0x0f, 0x8f, 0xeb, 0x96, 0x25, 0x4d, 0x3e, 0x5a, 0x09, - 0x17, 0xd4, 0xaa, 0xfb, 0x5e, 0xf7, 0xd5, 0x37, 0x7b, 0xfe, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x4c, - 0x4f, 0x45, 0x6a, 0x00, 0x03, 0x00, 0x00, + proto.RegisterFile("entity/sender_alias.proto", fileDescriptor_sender_alias_ea804a9a8a5998cb) +} + +var fileDescriptor_sender_alias_ea804a9a8a5998cb = []byte{ + // 471 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x51, 0xcf, 0x8a, 0xd3, 0x40, + 0x18, 0xef, 0x74, 0x6b, 0x37, 0x99, 0xae, 0xdd, 0x30, 0x88, 0xc4, 0x22, 0x4d, 0xe8, 0x29, 0xc2, + 0x92, 0xc0, 0x7a, 0x11, 0xf5, 0x92, 0x26, 0x39, 0x84, 0x85, 0x2c, 0xa4, 0xab, 0x82, 0x97, 0x90, + 0x66, 0x66, 0xe3, 0xe0, 0x36, 0x53, 0x26, 0xd3, 0x85, 0xbe, 0x85, 0x47, 0x9f, 0xc1, 0x27, 0xd9, + 0xa3, 0x4f, 0x10, 0x25, 0xbe, 0x81, 0x4f, 0x20, 0x33, 0x69, 0x35, 0x57, 0x6f, 0xdf, 0x7c, 0xbf, + 0x7f, 0xfc, 0xbe, 0x81, 0xcf, 0x48, 0x25, 0xa8, 0xd8, 0x7b, 0x35, 0xa9, 0x30, 0xe1, 0x59, 0x7e, + 0x47, 0xf3, 0xda, 0xdd, 0x72, 0x26, 0x18, 0x3a, 0x5b, 0x13, 0x2e, 0xf6, 0x6e, 0x47, 0x98, 0x3d, + 0x29, 0x59, 0xc9, 0x14, 0xe0, 0xc9, 0xa9, 0xe3, 0xcc, 0xac, 0x92, 0xb1, 0xf2, 0x8e, 0x78, 0xea, + 0xb5, 0xde, 0xdd, 0x7a, 0x82, 0x6e, 0x48, 0x2d, 0xf2, 0xcd, 0xb6, 0x23, 0x2c, 0xbe, 0x8d, 0xe0, + 0x64, 0xa5, 0xbc, 0x7d, 0x69, 0x8d, 0x2e, 0xe0, 0x90, 0x62, 0x13, 0xd8, 0xc0, 0xd1, 0x97, 0xcf, + 0xdb, 0xc6, 0x1a, 0xc6, 0xe1, 0xef, 0xc6, 0x42, 0x25, 0xe3, 0x9b, 0xd7, 0x8b, 0x2d, 0xa7, 0x9b, + 0x9c, 0xef, 0xb3, 0xcf, 0x64, 0xbf, 0x48, 0x87, 0x14, 0xa3, 0x00, 0xc2, 0x82, 0x93, 0x5c, 0x10, + 0x9c, 0xe5, 0xc2, 0x1c, 0xda, 0xc0, 0x99, 0x5c, 0xce, 0xdc, 0x2e, 0xd3, 0x3d, 0x66, 0xba, 0x37, + 0xc7, 0xcc, 0xa5, 0xf6, 0xd0, 0x58, 0x83, 0x2f, 0x3f, 0x2c, 0x90, 0xea, 0x07, 0x9d, 0x2f, 0xa4, + 0xc9, 0x6e, 0x8b, 0x8f, 0x26, 0x27, 0xff, 0x63, 0x72, 0xd0, 0xf9, 0x02, 0xbd, 0x82, 0xe3, 0x5a, + 0xe4, 0x62, 0x57, 0x9b, 0x8f, 0x6c, 0xe0, 0x4c, 0x2f, 0x6d, 0xb7, 0x7f, 0x1d, 0xb7, 0x57, 0xd1, + 0x5d, 0x29, 0x5e, 0x7a, 0xe0, 0xa3, 0xb7, 0xd0, 0x60, 0x9c, 0x96, 0xb4, 0xca, 0x30, 0xb9, 0xa7, + 0x05, 0xc9, 0x28, 0x36, 0xc7, 0xaa, 0x3f, 0x6a, 0x1b, 0x6b, 0x7a, 0xad, 0xb0, 0x50, 0x41, 0x71, + 0x98, 0x4e, 0x59, 0xff, 0x8d, 0xd1, 0x05, 0x84, 0x05, 0xab, 0x44, 0x5e, 0x08, 0xa9, 0x3b, 0x55, + 0xba, 0xc7, 0x6d, 0x63, 0xe9, 0x41, 0xb7, 0x8d, 0xc3, 0x54, 0x3f, 0x10, 0x62, 0x8c, 0xde, 0xc0, + 0xf3, 0x82, 0x55, 0xf7, 0x84, 0xd7, 0xb9, 0xa0, 0xac, 0x92, 0x12, 0xed, 0x5f, 0x54, 0xd0, 0x83, + 0x64, 0x54, 0x9f, 0x1a, 0x63, 0xf4, 0x02, 0x1a, 0xea, 0xfb, 0x33, 0x8a, 0x65, 0xab, 0x5b, 0x4a, + 0xb8, 0xa9, 0x4b, 0x75, 0x7a, 0xae, 0xf6, 0xf1, 0xdf, 0x35, 0x42, 0x70, 0xb4, 0xab, 0x09, 0x36, + 0xa1, 0x0d, 0x1c, 0x2d, 0x55, 0xf3, 0xc2, 0x87, 0xe3, 0xae, 0x39, 0x9a, 0xc0, 0xd3, 0x77, 0xc9, + 0x55, 0x72, 0xfd, 0x21, 0x31, 0x06, 0x48, 0x83, 0xa3, 0x55, 0x94, 0xdc, 0x18, 0x00, 0x21, 0x38, + 0x95, 0x53, 0xe6, 0x27, 0x61, 0xe6, 0x07, 0x57, 0x51, 0x68, 0x0c, 0xd1, 0x19, 0xd4, 0xd2, 0x28, + 0x88, 0xe2, 0xf7, 0x51, 0x68, 0x9c, 0x2c, 0x9d, 0x87, 0x76, 0x0e, 0xbe, 0xb7, 0x73, 0xf0, 0xb3, + 0x9d, 0x83, 0xaf, 0xbf, 0xe6, 0x83, 0x8f, 0x4f, 0xbb, 0x2b, 0x0b, 0x52, 0x7c, 0xf2, 0x0a, 0xc6, + 0x89, 0xd7, 0xdd, 0x7b, 0x3d, 0x56, 0xff, 0xf6, 0xf2, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x21, + 0xb4, 0x79, 0x65, 0xbf, 0x02, 0x00, 0x00, } diff --git a/core/entity/sender_alias.proto b/core/entity/sender_alias.proto index 6ff431e52e..8b5be817e7 100644 --- a/core/entity/sender_alias.proto +++ b/core/entity/sender_alias.proto @@ -18,7 +18,6 @@ message SenderAlias { string id = 1 [(gogoproto.moretags) = "gorm:\"primary_key\"", (gogoproto.customname) = "ID"]; google.protobuf.Timestamp created_at = 2 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false]; google.protobuf.Timestamp updated_at = 3 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false]; - google.protobuf.Timestamp deleted_at = 4 [(gogoproto.stdtime) = true]; Status status = 5;