sour-is/ev
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: eventMeta -> event.IsEvent

Browse Source
This commit is contained in:
Jon Lundy
2023-04-02 16:45:17 -06:00
parent 6ee995298b
commit 9168f5c7bc
16 changed files with 186 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/peerfinder/ev-info.go
View File

@@ -51,22 +51,11 @@ func (a *Info) OnUpsert() error {
type VersionChanged struct {
ScriptVersion string `json:"script_version"`
eventMeta event.Meta
event.IsEvent
}
var _ event.Event = (*VersionChanged)(nil)
func (e *VersionChanged) EventMeta() event.Meta {
if e == nil {
return event.Meta{}
}
return e.eventMeta
}
func (e *VersionChanged) SetEventMeta(m event.Meta) {
if e != nil {
e.eventMeta = m
}
}
func (e *VersionChanged) MarshalBinary() (text []byte, err error) {
return json.Marshal(e)
}

45
app/peerfinder/ev-request.go
View File

@@ -33,7 +33,7 @@ func (a *Request) ApplyEvent(lis ...event.Event) {
for _, e := range lis {
switch e := e.(type) {
case *RequestSubmitted:
a.RequestID = e.eventMeta.EventID.String()
a.RequestID = e.EventMeta().EventID.String()
a.RequestIP = e.RequestIP
a.Hidden = e.Hidden
a.Created = ulid.Time(e.EventMeta().EventID.Time())
@@ -120,7 +120,7 @@ func (lis ListResponse) Swap(i, j int) {
}
type RequestSubmitted struct {
eventMeta event.Meta
event.IsEvent
RequestIP string `json:"req_ip"`
Hidden bool `json:"hide,omitempty"`
@@ -154,22 +154,11 @@ func (r *RequestSubmitted) Family() int {
}
}
func (r *RequestSubmitted) String() string {
return fmt.Sprint(r.eventMeta.EventID, r.RequestIP, r.Hidden, r.CreatedString())
return fmt.Sprint(r.EventMeta().EventID, r.RequestIP, r.Hidden, r.CreatedString())
}
var _ event.Event = (*RequestSubmitted)(nil)
func (e *RequestSubmitted) EventMeta() event.Meta {
if e == nil {
return event.Meta{}
}
return e.eventMeta
}
func (e *RequestSubmitted) SetEventMeta(m event.Meta) {
if e != nil {
e.eventMeta = m
}
}
func (e *RequestSubmitted) MarshalBinary() (text []byte, err error) {
return json.Marshal(e)
}
@@ -204,7 +193,7 @@ func (e *RequestSubmitted) MarshalEnviron() ([]byte, error) {
}
type ResultSubmitted struct {
eventMeta event.Meta
event.IsEvent
RequestID string `json:"req_id"`
PeerID string `json:"peer_id"`
@@ -219,22 +208,11 @@ type ResultSubmitted struct {
}
func (r *ResultSubmitted) Created() time.Time {
return r.eventMeta.Created()
return r.EventMeta().Created()
}
var _ event.Event = (*ResultSubmitted)(nil)
func (e *ResultSubmitted) EventMeta() event.Meta {
if e == nil {
return event.Meta{}
}
return e.eventMeta
}
func (e *ResultSubmitted) SetEventMeta(m event.Meta) {
if e != nil {
e.eventMeta = m
}
}
func (e *ResultSubmitted) MarshalBinary() (text []byte, err error) {
return json.Marshal(e)
}
@@ -248,22 +226,11 @@ func (e *ResultSubmitted) String() string {
type RequestTruncated struct {
RequestID string
eventMeta event.Meta
event.IsEvent
}
var _ event.Event = (*RequestTruncated)(nil)
func (e *RequestTruncated) EventMeta() event.Meta {
if e == nil {
return event.Meta{}
}
return e.eventMeta
}
func (e *RequestTruncated) SetEventMeta(m event.Meta) {
if e != nil {
e.eventMeta = m
}
}
func (e *RequestTruncated) MarshalBinary() (text []byte, err error) {
return json.Marshal(e)
}

2
app/peerfinder/jobs.go
View File

@@ -164,7 +164,7 @@ func (s *service) cleanRequests(ctx context.Context, now time.Time) error {
for _, event := range events {
switch e := event.(type) {
case *RequestSubmitted:
if e.eventMeta.ActualPosition < last-maxResults {
if e.EventMeta().ActualPosition < last-maxResults {
streamIDs = append(streamIDs, e.RequestID())
}
}