diff --git a/components/api/services/authorize_interaction_service.go b/components/api/services/authorize_interaction_service.go index c1d6f5f..b391440 100644 --- a/components/api/services/authorize_interaction_service.go +++ b/components/api/services/authorize_interaction_service.go @@ -10,7 +10,6 @@ import ( // noinspection GoUnusedParameter func AuthorizeInteractionService(context IContext, input *AuthorizeInteractionRequest) (result *AuthorizeInteractionResult, err error) { conductor := core.Conductor - _ = AUTHORIZE_INTERACTION_REQUEST conductor.LogRemoteCall(context, INITIALIZE, "authorize_interaction", input, result, err) defer func() { conductor.LogRemoteCall(context, FINALIZE, "authorize_interaction", input, result, err) }() diff --git a/components/api/services/check_username_availability_service.go b/components/api/services/check_username_availability_service.go index 18e1906..07b13e1 100644 --- a/components/api/services/check_username_availability_service.go +++ b/components/api/services/check_username_availability_service.go @@ -10,7 +10,6 @@ import ( // noinspection GoUnusedParameter func CheckUsernameAvailabilityService(context IContext, input *CheckUsernameAvailabilityRequest) (result *CheckUsernameAvailabilityResult, err error) { conductor := core.Conductor - _ = CHECK_USERNAME_AVAILABILITY_REQUEST conductor.LogRemoteCall(context, INITIALIZE, "check_username_availability", input, result, err) defer func() { conductor.LogRemoteCall(context, FINALIZE, "check_username_availability", input, result, err) }() diff --git a/components/api/services/echo_service.go b/components/api/services/echo_service.go index 2751599..a3320f7 100644 --- a/components/api/services/echo_service.go +++ b/components/api/services/echo_service.go @@ -10,7 +10,6 @@ import ( // noinspection GoUnusedParameter func EchoService(context IContext, input *EchoRequest) (result *EchoResult, err error) { conductor := core.Conductor - _ = ECHO_REQUEST conductor.LogRemoteCall(context, INITIALIZE, "echo", input, result, err) defer func() { conductor.LogRemoteCall(context, FINALIZE, "echo", input, result, err) }() diff --git a/components/api/services/follow_actor_service.go b/components/api/services/follow_actor_service.go index 2dd1614..4ca3c19 100644 --- a/components/api/services/follow_actor_service.go +++ b/components/api/services/follow_actor_service.go @@ -10,7 +10,6 @@ import ( // noinspection GoUnusedParameter func FollowActorService(context IContext, input *FollowActorRequest) (result *FollowActorResult, err error) { conductor := core.Conductor - _ = FOLLOW_ACTOR_REQUEST conductor.LogRemoteCall(context, INITIALIZE, "follow_actor", input, result, err) defer func() { conductor.LogRemoteCall(context, FINALIZE, "follow_actor", input, result, err) }() diff --git a/components/api/services/get_actor_service.go b/components/api/services/get_actor_service.go index 2867d41..d7ae071 100644 --- a/components/api/services/get_actor_service.go +++ b/components/api/services/get_actor_service.go @@ -10,7 +10,6 @@ import ( // noinspection GoUnusedParameter func GetActorService(context IContext, input *GetActorRequest) (result *GetActorResult, err error) { conductor := core.Conductor - _ = GET_ACTOR_REQUEST conductor.LogRemoteCall(context, INITIALIZE, "get_actor", input, result, err) defer func() { conductor.LogRemoteCall(context, FINALIZE, "get_actor", input, result, err) }() diff --git a/components/api/services/get_followers_service.go b/components/api/services/get_followers_service.go index 12ce8f6..0666078 100644 --- a/components/api/services/get_followers_service.go +++ b/components/api/services/get_followers_service.go @@ -10,7 +10,6 @@ import ( // noinspection GoUnusedParameter func GetFollowersService(context IContext, input *GetFollowersRequest) (result *GetFollowersResult, err error) { conductor := core.Conductor - _ = GET_FOLLOWERS_REQUEST conductor.LogRemoteCall(context, INITIALIZE, "get_followers", input, result, err) defer func() { conductor.LogRemoteCall(context, FINALIZE, "get_followers", input, result, err) }() diff --git a/components/api/services/get_following_service.go b/components/api/services/get_following_service.go index 428bd30..a041055 100644 --- a/components/api/services/get_following_service.go +++ b/components/api/services/get_following_service.go @@ -10,7 +10,6 @@ import ( // noinspection GoUnusedParameter func GetFollowingService(context IContext, input *GetFollowingRequest) (result *GetFollowingResult, err error) { conductor := core.Conductor - _ = GET_FOLLOWING_REQUEST conductor.LogRemoteCall(context, INITIALIZE, "get_following", input, result, err) defer func() { conductor.LogRemoteCall(context, FINALIZE, "get_following", input, result, err) }() diff --git a/components/api/services/get_inbox_service.go b/components/api/services/get_inbox_service.go index 8eff85d..67c1c06 100644 --- a/components/api/services/get_inbox_service.go +++ b/components/api/services/get_inbox_service.go @@ -10,7 +10,6 @@ import ( // noinspection GoUnusedParameter func GetInboxService(context IContext, input *GetInboxRequest) (result *GetInboxResult, err error) { conductor := core.Conductor - _ = GET_INBOX_REQUEST conductor.LogRemoteCall(context, INITIALIZE, "get_inbox", input, result, err) defer func() { conductor.LogRemoteCall(context, FINALIZE, "get_inbox", input, result, err) }() diff --git a/components/api/services/get_outbox_service.go b/components/api/services/get_outbox_service.go index c11b195..e6caacf 100644 --- a/components/api/services/get_outbox_service.go +++ b/components/api/services/get_outbox_service.go @@ -10,7 +10,6 @@ import ( // noinspection GoUnusedParameter func GetOutboxService(context IContext, input *GetOutboxRequest) (result *GetOutboxResult, err error) { conductor := core.Conductor - _ = GET_OUTBOX_REQUEST conductor.LogRemoteCall(context, INITIALIZE, "get_outbox", input, result, err) defer func() { conductor.LogRemoteCall(context, FINALIZE, "get_outbox", input, result, err) }() diff --git a/components/api/services/get_packages_service.go b/components/api/services/get_packages_service.go index 672a398..6f1e270 100644 --- a/components/api/services/get_packages_service.go +++ b/components/api/services/get_packages_service.go @@ -10,7 +10,6 @@ import ( // noinspection GoUnusedParameter func GetPackagesService(context IContext, input *GetPackagesRequest) (result *GetPackagesResult, err error) { conductor := core.Conductor - _ = GET_PACKAGES_REQUEST conductor.LogRemoteCall(context, INITIALIZE, "get_packages", input, result, err) defer func() { conductor.LogRemoteCall(context, FINALIZE, "get_packages", input, result, err) }() diff --git a/components/api/services/get_profile_by_user_service.go b/components/api/services/get_profile_by_user_service.go index 983a82f..f38834e 100644 --- a/components/api/services/get_profile_by_user_service.go +++ b/components/api/services/get_profile_by_user_service.go @@ -10,7 +10,6 @@ import ( // noinspection GoUnusedParameter func GetProfileByUserService(context IContext, input *GetProfileByUserRequest) (result *GetProfileByUserResult, err error) { conductor := core.Conductor - _ = GET_PROFILE_BY_USER_REQUEST conductor.LogRemoteCall(context, INITIALIZE, "get_profile_by_user", input, result, err) defer func() { conductor.LogRemoteCall(context, FINALIZE, "get_profile_by_user", input, result, err) }() diff --git a/components/api/services/login_service.go b/components/api/services/login_service.go index 485ab4f..2070219 100644 --- a/components/api/services/login_service.go +++ b/components/api/services/login_service.go @@ -10,7 +10,6 @@ import ( // noinspection GoUnusedParameter func LoginService(context IContext, input *LoginRequest) (result *LoginResult, err error) { conductor := core.Conductor - _ = LOGIN_REQUEST conductor.LogRemoteCall(context, INITIALIZE, "login", input, result, err) defer func() { conductor.LogRemoteCall(context, FINALIZE, "login", input, result, err) }() diff --git a/components/api/services/logout_service.go b/components/api/services/logout_service.go index c605e07..1ab2bd3 100644 --- a/components/api/services/logout_service.go +++ b/components/api/services/logout_service.go @@ -10,7 +10,6 @@ import ( // noinspection GoUnusedParameter func LogoutService(context IContext, input *LogoutRequest) (result *LogoutResult, err error) { conductor := core.Conductor - _ = LOGOUT_REQUEST conductor.LogRemoteCall(context, INITIALIZE, "logout", input, result, err) defer func() { conductor.LogRemoteCall(context, FINALIZE, "logout", input, result, err) }() diff --git a/components/api/services/post_to_inbox_service.go b/components/api/services/post_to_inbox_service.go index 5804142..ee5940a 100644 --- a/components/api/services/post_to_inbox_service.go +++ b/components/api/services/post_to_inbox_service.go @@ -10,7 +10,6 @@ import ( // noinspection GoUnusedParameter func PostToInboxService(context IContext, input *PostToInboxRequest) (result *PostToInboxResult, err error) { conductor := core.Conductor - _ = POST_TO_INBOX_REQUEST conductor.LogRemoteCall(context, INITIALIZE, "post_to_inbox", input, result, err) defer func() { conductor.LogRemoteCall(context, FINALIZE, "post_to_inbox", input, result, err) }() diff --git a/components/api/services/post_to_outbox_service.go b/components/api/services/post_to_outbox_service.go index f67479a..663a6d5 100644 --- a/components/api/services/post_to_outbox_service.go +++ b/components/api/services/post_to_outbox_service.go @@ -10,7 +10,6 @@ import ( // noinspection GoUnusedParameter func PostToOutboxService(context IContext, input *PostToOutboxRequest) (result *PostToOutboxResult, err error) { conductor := core.Conductor - _ = POST_TO_OUTBOX_REQUEST conductor.LogRemoteCall(context, INITIALIZE, "post_to_outbox", input, result, err) defer func() { conductor.LogRemoteCall(context, FINALIZE, "post_to_outbox", input, result, err) }() diff --git a/components/api/services/signup_service.go b/components/api/services/signup_service.go index c95f634..b612111 100644 --- a/components/api/services/signup_service.go +++ b/components/api/services/signup_service.go @@ -10,7 +10,6 @@ import ( // noinspection GoUnusedParameter func SignupService(context IContext, input *SignupRequest) (result *SignupResult, err error) { conductor := core.Conductor - _ = SIGNUP_REQUEST conductor.LogRemoteCall(context, INITIALIZE, "signup", input, result, err) defer func() { conductor.LogRemoteCall(context, FINALIZE, "signup", input, result, err) }() diff --git a/components/api/services/update_profile_by_user_service.go b/components/api/services/update_profile_by_user_service.go index 8f062c8..730b235 100644 --- a/components/api/services/update_profile_by_user_service.go +++ b/components/api/services/update_profile_by_user_service.go @@ -10,7 +10,6 @@ import ( // noinspection GoUnusedParameter func UpdateProfileByUserService(context IContext, input *UpdateProfileByUserRequest) (result *UpdateProfileByUserResult, err error) { conductor := core.Conductor - _ = UPDATE_PROFILE_BY_USER_REQUEST conductor.LogRemoteCall(context, INITIALIZE, "update_profile_by_user", input, result, err) defer func() { conductor.LogRemoteCall(context, FINALIZE, "update_profile_by_user", input, result, err) }() diff --git a/components/api/services/verify_service.go b/components/api/services/verify_service.go index eee295b..e11aaf2 100644 --- a/components/api/services/verify_service.go +++ b/components/api/services/verify_service.go @@ -10,7 +10,6 @@ import ( // noinspection GoUnusedParameter func VerifyService(context IContext, input *VerifyRequest) (result *VerifyResult, err error) { conductor := core.Conductor - _ = VERIFY_REQUEST conductor.LogRemoteCall(context, INITIALIZE, "verify", input, result, err) defer func() { conductor.LogRemoteCall(context, FINALIZE, "verify", input, result, err) }() diff --git a/components/api/services/webfinger_service.go b/components/api/services/webfinger_service.go index eaac1a4..67e464d 100644 --- a/components/api/services/webfinger_service.go +++ b/components/api/services/webfinger_service.go @@ -10,7 +10,6 @@ import ( // noinspection GoUnusedParameter func WebfingerService(context IContext, input *WebfingerRequest) (result *WebfingerResult, err error) { conductor := core.Conductor - _ = WEBFINGER_REQUEST conductor.LogRemoteCall(context, INITIALIZE, "webfinger", input, result, err) defer func() { conductor.LogRemoteCall(context, FINALIZE, "webfinger", input, result, err) }() diff --git a/components/constants/errors.go b/components/constants/errors.go index 1536358..77ff293 100644 --- a/components/constants/errors.go +++ b/components/constants/errors.go @@ -2,9 +2,6 @@ package constants import "errors" -// noinspection GoSnakeCaseUsage -const ENABLE_CUSTOM_ERRORS = true - // noinspection GoSnakeCaseUsage const ( // SYSTEM_ERRORS diff --git a/components/contracts/model/entity.go b/components/contracts/model/entity.go index 922d3bc..f768035 100644 --- a/components/contracts/model/entity.go +++ b/components/contracts/model/entity.go @@ -13,6 +13,8 @@ type ( IEntity interface { Stringer Id() int64 + SortOrder() float32 + SetSortOrder(float32) Payload() string SetPayload(string) Validate() error diff --git a/components/contracts/object.go b/components/contracts/object.go index fb3735e..ed82490 100644 --- a/components/contracts/object.go +++ b/components/contracts/object.go @@ -4,9 +4,10 @@ import . "fmt" type IObject interface { Stringer - // Returns the unique identifier or 'Id' of this object instance. + // Id returns the unique identifier or 'Id' of this object instance. Id() int64 - // Checks whether the current instance contains any errors. + SortOrder() float32 + // Validate checks whether the current instance contains any errors. Validate() error Lock(context uint64) Unlock(context uint64) diff --git a/components/contracts/system_dispatcher.go b/components/contracts/system_dispatcher.go index c2019d8..c5cdc1c 100644 --- a/components/contracts/system_dispatcher.go +++ b/components/contracts/system_dispatcher.go @@ -1175,7 +1175,7 @@ type IDispatcher interface { // Format provides a wrapper around fmt.Sprintf Format(format string, args ...interface{}) string // Sort sorts the provided slice using the provided comparator function. - Sort(slice interface{}, less func(a, b int) bool) + Sort(slice interface{}, less func(x, y int) bool) // Search searches the input for any or all of the words in criteria. Search(input, criteria string) bool // Email sends an email message asynchronously. diff --git a/components/core/access_control.go b/components/core/access_control.go index 27703ff..1d96b81 100644 --- a/components/core/access_control.go +++ b/components/core/access_control.go @@ -3,8 +3,6 @@ package core import ( "fmt" - "github.com/reiver/greatape/app/validators" - . "github.com/reiver/greatape/components/constants" . "github.com/reiver/greatape/components/contracts" . "github.com/reiver/greatape/components/contracts/model" "github.com/reiver/greatape/components/model/repository" @@ -17,14 +15,6 @@ type accessControl struct { value uint64 } -// noinspection GoUnusedExportedFunction -func InitializeAccessControl() { - _ = ENABLE_SECURITY - _ = ENABLE_CUSTOM_ERRORS - _ = validators.Initialize - _ = repository.Initialize -} - func NewAccessControl(id int64, key uint64, value uint64) (IAccessControl, error) { instance := &accessControl{ object: object{ diff --git a/components/core/access_control_manager.go b/components/core/access_control_manager.go index e907052..4fe57f7 100644 --- a/components/core/access_control_manager.go +++ b/components/core/access_control_manager.go @@ -1,7 +1,6 @@ package core import ( - "github.com/reiver/greatape/app/validators" . "github.com/reiver/greatape/components/constants" . "github.com/reiver/greatape/components/contracts" . "github.com/reiver/greatape/components/contracts/model" @@ -23,9 +22,6 @@ type accessControlManager struct { } func newAccessControlManager(configuration IConfiguration, logger ILogger, dependencies ...ISystemComponent) IAccessControlManager { - _ = ENABLE_CUSTOM_ERRORS - _ = validators.Initialize - manager := &accessControlManager{ systemComponent: newSystemComponent(configuration, logger), cache: NewCache(), diff --git a/components/core/activity_pub_activity.go b/components/core/activity_pub_activity.go index 39b305f..c750af3 100644 --- a/components/core/activity_pub_activity.go +++ b/components/core/activity_pub_activity.go @@ -3,11 +3,7 @@ package core import ( "fmt" - "github.com/reiver/greatape/app/validators" - . "github.com/reiver/greatape/components/constants" . "github.com/reiver/greatape/components/contracts" - "github.com/reiver/greatape/components/model/repository" - . "github.com/xeronith/diamante/contracts/security" ) type activityPubActivity struct { @@ -23,14 +19,6 @@ type activityPubActivity struct { published string } -// noinspection GoUnusedExportedFunction -func InitializeActivityPubActivity() { - _ = ENABLE_SECURITY - _ = ENABLE_CUSTOM_ERRORS - _ = validators.Initialize - _ = repository.Initialize -} - func NewActivityPubActivity() (IActivityPubActivity, error) { instance := &activityPubActivity{} diff --git a/components/core/activity_pub_activity_manager.go b/components/core/activity_pub_activity_manager.go index 3c0b868..ff2d987 100644 --- a/components/core/activity_pub_activity_manager.go +++ b/components/core/activity_pub_activity_manager.go @@ -1,7 +1,6 @@ package core import ( - "github.com/reiver/greatape/app/validators" . "github.com/reiver/greatape/components/constants" . "github.com/reiver/greatape/components/contracts" . "github.com/xeronith/diamante/contracts/logging" @@ -20,9 +19,6 @@ type activityPubActivityManager struct { } func newActivityPubActivityManager(configuration IConfiguration, logger ILogger, dependencies ...ISystemComponent) IActivityPubActivityManager { - _ = ENABLE_CUSTOM_ERRORS - _ = validators.Initialize - manager := &activityPubActivityManager{ systemComponent: newSystemComponent(configuration, logger), cache: NewCache(), diff --git a/components/core/activity_pub_follower.go b/components/core/activity_pub_follower.go index e5cea99..5d42bad 100644 --- a/components/core/activity_pub_follower.go +++ b/components/core/activity_pub_follower.go @@ -3,8 +3,6 @@ package core import ( "fmt" - "github.com/reiver/greatape/app/validators" - . "github.com/reiver/greatape/components/constants" . "github.com/reiver/greatape/components/contracts" . "github.com/reiver/greatape/components/contracts/model" "github.com/reiver/greatape/components/model/repository" @@ -20,14 +18,6 @@ type activityPubFollower struct { accepted bool } -// noinspection GoUnusedExportedFunction -func InitializeActivityPubFollower() { - _ = ENABLE_SECURITY - _ = ENABLE_CUSTOM_ERRORS - _ = validators.Initialize - _ = repository.Initialize -} - func NewActivityPubFollower(id int64, handle string, inbox string, subject string, activity string, accepted bool) (IActivityPubFollower, error) { instance := &activityPubFollower{ object: object{ diff --git a/components/core/activity_pub_follower_manager.go b/components/core/activity_pub_follower_manager.go index b016205..7015659 100644 --- a/components/core/activity_pub_follower_manager.go +++ b/components/core/activity_pub_follower_manager.go @@ -1,7 +1,6 @@ package core import ( - "github.com/reiver/greatape/app/validators" . "github.com/reiver/greatape/components/constants" . "github.com/reiver/greatape/components/contracts" . "github.com/reiver/greatape/components/contracts/model" @@ -23,9 +22,6 @@ type activityPubFollowerManager struct { } func newActivityPubFollowerManager(configuration IConfiguration, logger ILogger, dependencies ...ISystemComponent) IActivityPubFollowerManager { - _ = ENABLE_CUSTOM_ERRORS - _ = validators.Initialize - manager := &activityPubFollowerManager{ systemComponent: newSystemComponent(configuration, logger), cache: NewCache(), diff --git a/components/core/activity_pub_incoming_activity.go b/components/core/activity_pub_incoming_activity.go index 86ec7d2..5219c28 100644 --- a/components/core/activity_pub_incoming_activity.go +++ b/components/core/activity_pub_incoming_activity.go @@ -3,7 +3,6 @@ package core import ( "fmt" - "github.com/reiver/greatape/app/validators" . "github.com/reiver/greatape/components/constants" . "github.com/reiver/greatape/components/contracts" . "github.com/reiver/greatape/components/contracts/model" @@ -22,14 +21,6 @@ type activityPubIncomingActivity struct { raw string } -// noinspection GoUnusedExportedFunction -func InitializeActivityPubIncomingActivity() { - _ = ENABLE_SECURITY - _ = ENABLE_CUSTOM_ERRORS - _ = validators.Initialize - _ = repository.Initialize -} - func NewActivityPubIncomingActivity(id int64, identityId int64, uniqueIdentifier string, timestamp int64, from string, to string, content string, raw string) (IActivityPubIncomingActivity, error) { instance := &activityPubIncomingActivity{ object: object{ diff --git a/components/core/activity_pub_incoming_activity_manager.go b/components/core/activity_pub_incoming_activity_manager.go index 721210f..e25d948 100644 --- a/components/core/activity_pub_incoming_activity_manager.go +++ b/components/core/activity_pub_incoming_activity_manager.go @@ -1,7 +1,6 @@ package core import ( - "github.com/reiver/greatape/app/validators" . "github.com/reiver/greatape/components/constants" . "github.com/reiver/greatape/components/contracts" . "github.com/reiver/greatape/components/contracts/model" @@ -27,9 +26,6 @@ type activityPubIncomingActivityManager struct { } func newActivityPubIncomingActivityManager(configuration IConfiguration, logger ILogger, dependencies ...ISystemComponent) IActivityPubIncomingActivityManager { - _ = ENABLE_CUSTOM_ERRORS - _ = validators.Initialize - manager := &activityPubIncomingActivityManager{ systemComponent: newSystemComponent(configuration, logger), cache: NewCache(), diff --git a/components/core/activity_pub_link.go b/components/core/activity_pub_link.go index bbcb0f8..f6cfd74 100644 --- a/components/core/activity_pub_link.go +++ b/components/core/activity_pub_link.go @@ -3,11 +3,7 @@ package core import ( "fmt" - "github.com/reiver/greatape/app/validators" - . "github.com/reiver/greatape/components/constants" . "github.com/reiver/greatape/components/contracts" - "github.com/reiver/greatape/components/model/repository" - . "github.com/xeronith/diamante/contracts/security" ) type activityPubLink struct { @@ -17,14 +13,6 @@ type activityPubLink struct { template string } -// noinspection GoUnusedExportedFunction -func InitializeActivityPubLink() { - _ = ENABLE_SECURITY - _ = ENABLE_CUSTOM_ERRORS - _ = validators.Initialize - _ = repository.Initialize -} - func NewActivityPubLink() (IActivityPubLink, error) { instance := &activityPubLink{} diff --git a/components/core/activity_pub_link_manager.go b/components/core/activity_pub_link_manager.go index f815127..a97f564 100644 --- a/components/core/activity_pub_link_manager.go +++ b/components/core/activity_pub_link_manager.go @@ -1,7 +1,6 @@ package core import ( - "github.com/reiver/greatape/app/validators" . "github.com/reiver/greatape/components/constants" . "github.com/reiver/greatape/components/contracts" . "github.com/xeronith/diamante/contracts/logging" @@ -20,9 +19,6 @@ type activityPubLinkManager struct { } func newActivityPubLinkManager(configuration IConfiguration, logger ILogger, dependencies ...ISystemComponent) IActivityPubLinkManager { - _ = ENABLE_CUSTOM_ERRORS - _ = validators.Initialize - manager := &activityPubLinkManager{ systemComponent: newSystemComponent(configuration, logger), cache: NewCache(), diff --git a/components/core/activity_pub_media.go b/components/core/activity_pub_media.go index 5ca856a..ce0f824 100644 --- a/components/core/activity_pub_media.go +++ b/components/core/activity_pub_media.go @@ -3,11 +3,7 @@ package core import ( "fmt" - "github.com/reiver/greatape/app/validators" - . "github.com/reiver/greatape/components/constants" . "github.com/reiver/greatape/components/contracts" - "github.com/reiver/greatape/components/model/repository" - . "github.com/xeronith/diamante/contracts/security" ) type activityPubMedia struct { @@ -18,14 +14,6 @@ type activityPubMedia struct { height int32 } -// noinspection GoUnusedExportedFunction -func InitializeActivityPubMedia() { - _ = ENABLE_SECURITY - _ = ENABLE_CUSTOM_ERRORS - _ = validators.Initialize - _ = repository.Initialize -} - func NewActivityPubMedia() (IActivityPubMedia, error) { instance := &activityPubMedia{} diff --git a/components/core/activity_pub_media_manager.go b/components/core/activity_pub_media_manager.go index 88fb527..b2640ec 100644 --- a/components/core/activity_pub_media_manager.go +++ b/components/core/activity_pub_media_manager.go @@ -1,7 +1,6 @@ package core import ( - "github.com/reiver/greatape/app/validators" . "github.com/reiver/greatape/components/constants" . "github.com/reiver/greatape/components/contracts" . "github.com/xeronith/diamante/contracts/logging" @@ -20,9 +19,6 @@ type activityPubMediaManager struct { } func newActivityPubMediaManager(configuration IConfiguration, logger ILogger, dependencies ...ISystemComponent) IActivityPubMediaManager { - _ = ENABLE_CUSTOM_ERRORS - _ = validators.Initialize - manager := &activityPubMediaManager{ systemComponent: newSystemComponent(configuration, logger), cache: NewCache(), diff --git a/components/core/activity_pub_object.go b/components/core/activity_pub_object.go index adebbc6..6e3d731 100644 --- a/components/core/activity_pub_object.go +++ b/components/core/activity_pub_object.go @@ -3,11 +3,7 @@ package core import ( "fmt" - "github.com/reiver/greatape/app/validators" - . "github.com/reiver/greatape/components/constants" . "github.com/reiver/greatape/components/contracts" - "github.com/reiver/greatape/components/model/repository" - . "github.com/xeronith/diamante/contracts/security" ) type activityPubObject struct { @@ -22,14 +18,6 @@ type activityPubObject struct { published string } -// noinspection GoUnusedExportedFunction -func InitializeActivityPubObject() { - _ = ENABLE_SECURITY - _ = ENABLE_CUSTOM_ERRORS - _ = validators.Initialize - _ = repository.Initialize -} - func NewActivityPubObject() (IActivityPubObject, error) { instance := &activityPubObject{} diff --git a/components/core/activity_pub_object_manager.go b/components/core/activity_pub_object_manager.go index 47bdb7c..2a2cada 100644 --- a/components/core/activity_pub_object_manager.go +++ b/components/core/activity_pub_object_manager.go @@ -1,7 +1,6 @@ package core import ( - "github.com/reiver/greatape/app/validators" . "github.com/reiver/greatape/components/constants" . "github.com/reiver/greatape/components/contracts" . "github.com/xeronith/diamante/contracts/logging" @@ -20,9 +19,6 @@ type activityPubObjectManager struct { } func newActivityPubObjectManager(configuration IConfiguration, logger ILogger, dependencies ...ISystemComponent) IActivityPubObjectManager { - _ = ENABLE_CUSTOM_ERRORS - _ = validators.Initialize - manager := &activityPubObjectManager{ systemComponent: newSystemComponent(configuration, logger), cache: NewCache(), diff --git a/components/core/activity_pub_outgoing_activity.go b/components/core/activity_pub_outgoing_activity.go index a8b37a6..69f5f24 100644 --- a/components/core/activity_pub_outgoing_activity.go +++ b/components/core/activity_pub_outgoing_activity.go @@ -3,7 +3,6 @@ package core import ( "fmt" - "github.com/reiver/greatape/app/validators" . "github.com/reiver/greatape/components/constants" . "github.com/reiver/greatape/components/contracts" . "github.com/reiver/greatape/components/contracts/model" @@ -22,14 +21,6 @@ type activityPubOutgoingActivity struct { raw string } -// noinspection GoUnusedExportedFunction -func InitializeActivityPubOutgoingActivity() { - _ = ENABLE_SECURITY - _ = ENABLE_CUSTOM_ERRORS - _ = validators.Initialize - _ = repository.Initialize -} - func NewActivityPubOutgoingActivity(id int64, identityId int64, uniqueIdentifier string, timestamp int64, from string, to string, content string, raw string) (IActivityPubOutgoingActivity, error) { instance := &activityPubOutgoingActivity{ object: object{ diff --git a/components/core/activity_pub_outgoing_activity_manager.go b/components/core/activity_pub_outgoing_activity_manager.go index 89474b8..f31cb4a 100644 --- a/components/core/activity_pub_outgoing_activity_manager.go +++ b/components/core/activity_pub_outgoing_activity_manager.go @@ -1,7 +1,6 @@ package core import ( - "github.com/reiver/greatape/app/validators" . "github.com/reiver/greatape/components/constants" . "github.com/reiver/greatape/components/contracts" . "github.com/reiver/greatape/components/contracts/model" @@ -27,9 +26,6 @@ type activityPubOutgoingActivityManager struct { } func newActivityPubOutgoingActivityManager(configuration IConfiguration, logger ILogger, dependencies ...ISystemComponent) IActivityPubOutgoingActivityManager { - _ = ENABLE_CUSTOM_ERRORS - _ = validators.Initialize - manager := &activityPubOutgoingActivityManager{ systemComponent: newSystemComponent(configuration, logger), cache: NewCache(), diff --git a/components/core/activity_pub_public_key.go b/components/core/activity_pub_public_key.go index 119701a..c39cd41 100644 --- a/components/core/activity_pub_public_key.go +++ b/components/core/activity_pub_public_key.go @@ -3,11 +3,7 @@ package core import ( "fmt" - "github.com/reiver/greatape/app/validators" - . "github.com/reiver/greatape/components/constants" . "github.com/reiver/greatape/components/contracts" - "github.com/reiver/greatape/components/model/repository" - . "github.com/xeronith/diamante/contracts/security" ) type activityPubPublicKey struct { @@ -16,14 +12,6 @@ type activityPubPublicKey struct { publicKeyPem string } -// noinspection GoUnusedExportedFunction -func InitializeActivityPubPublicKey() { - _ = ENABLE_SECURITY - _ = ENABLE_CUSTOM_ERRORS - _ = validators.Initialize - _ = repository.Initialize -} - func NewActivityPubPublicKey() (IActivityPubPublicKey, error) { instance := &activityPubPublicKey{} diff --git a/components/core/activity_pub_public_key_manager.go b/components/core/activity_pub_public_key_manager.go index 5981dd9..871a20a 100644 --- a/components/core/activity_pub_public_key_manager.go +++ b/components/core/activity_pub_public_key_manager.go @@ -1,7 +1,6 @@ package core import ( - "github.com/reiver/greatape/app/validators" . "github.com/reiver/greatape/components/constants" . "github.com/reiver/greatape/components/contracts" . "github.com/xeronith/diamante/contracts/logging" @@ -20,9 +19,6 @@ type activityPubPublicKeyManager struct { } func newActivityPubPublicKeyManager(configuration IConfiguration, logger ILogger, dependencies ...ISystemComponent) IActivityPubPublicKeyManager { - _ = ENABLE_CUSTOM_ERRORS - _ = validators.Initialize - manager := &activityPubPublicKeyManager{ systemComponent: newSystemComponent(configuration, logger), cache: NewCache(), diff --git a/components/core/category.go b/components/core/category.go index 8af0280..19162e5 100644 --- a/components/core/category.go +++ b/components/core/category.go @@ -3,7 +3,6 @@ package core import ( "fmt" - "github.com/reiver/greatape/app/validators" . "github.com/reiver/greatape/components/constants" . "github.com/reiver/greatape/components/contracts" . "github.com/reiver/greatape/components/contracts/model" @@ -19,14 +18,6 @@ type category struct { description string } -// noinspection GoUnusedExportedFunction -func InitializeCategory() { - _ = ENABLE_SECURITY - _ = ENABLE_CUSTOM_ERRORS - _ = validators.Initialize - _ = repository.Initialize -} - func NewCategory(id int64, categoryTypeId int64, categoryId int64, title string, description string) (ICategory, error) { instance := &category{ object: object{ diff --git a/components/core/category_manager.go b/components/core/category_manager.go index 1455053..ba65c2f 100644 --- a/components/core/category_manager.go +++ b/components/core/category_manager.go @@ -1,7 +1,6 @@ package core import ( - "github.com/reiver/greatape/app/validators" . "github.com/reiver/greatape/components/constants" . "github.com/reiver/greatape/components/contracts" . "github.com/reiver/greatape/components/contracts/model" @@ -28,9 +27,6 @@ type categoryManager struct { } func newCategoryManager(configuration IConfiguration, logger ILogger, dependencies ...ISystemComponent) ICategoryManager { - _ = ENABLE_CUSTOM_ERRORS - _ = validators.Initialize - manager := &categoryManager{ systemComponent: newSystemComponent(configuration, logger), cache: NewCache(), diff --git a/components/core/category_type.go b/components/core/category_type.go index 068c84b..2af2598 100644 --- a/components/core/category_type.go +++ b/components/core/category_type.go @@ -3,8 +3,6 @@ package core import ( "fmt" - "github.com/reiver/greatape/app/validators" - . "github.com/reiver/greatape/components/constants" . "github.com/reiver/greatape/components/contracts" . "github.com/reiver/greatape/components/contracts/model" "github.com/reiver/greatape/components/model/repository" @@ -16,14 +14,6 @@ type categoryType struct { description string } -// noinspection GoUnusedExportedFunction -func InitializeCategoryType() { - _ = ENABLE_SECURITY - _ = ENABLE_CUSTOM_ERRORS - _ = validators.Initialize - _ = repository.Initialize -} - func NewCategoryType(id int64, description string) (ICategoryType, error) { instance := &categoryType{ object: object{ diff --git a/components/core/category_type_manager.go b/components/core/category_type_manager.go index 429b4b1..b086f35 100644 --- a/components/core/category_type_manager.go +++ b/components/core/category_type_manager.go @@ -1,7 +1,6 @@ package core import ( - "github.com/reiver/greatape/app/validators" . "github.com/reiver/greatape/components/constants" . "github.com/reiver/greatape/components/contracts" . "github.com/reiver/greatape/components/contracts/model" @@ -23,9 +22,6 @@ type categoryTypeManager struct { } func newCategoryTypeManager(configuration IConfiguration, logger ILogger, dependencies ...ISystemComponent) ICategoryTypeManager { - _ = ENABLE_CUSTOM_ERRORS - _ = validators.Initialize - manager := &categoryTypeManager{ systemComponent: newSystemComponent(configuration, logger), cache: NewCache(), diff --git a/components/core/document.go b/components/core/document.go index e1d010c..d991c4a 100644 --- a/components/core/document.go +++ b/components/core/document.go @@ -3,8 +3,6 @@ package core import ( "fmt" - "github.com/reiver/greatape/app/validators" - . "github.com/reiver/greatape/components/constants" . "github.com/reiver/greatape/components/contracts" . "github.com/reiver/greatape/components/contracts/model" "github.com/reiver/greatape/components/model/repository" @@ -16,14 +14,6 @@ type document struct { content string } -// noinspection GoUnusedExportedFunction -func InitializeDocument() { - _ = ENABLE_SECURITY - _ = ENABLE_CUSTOM_ERRORS - _ = validators.Initialize - _ = repository.Initialize -} - func NewDocument(id int64, content string) (IDocument, error) { instance := &document{ object: object{ diff --git a/components/core/document_manager.go b/components/core/document_manager.go index 32eeec7..e130d98 100644 --- a/components/core/document_manager.go +++ b/components/core/document_manager.go @@ -1,7 +1,6 @@ package core import ( - "github.com/reiver/greatape/app/validators" . "github.com/reiver/greatape/components/constants" . "github.com/reiver/greatape/components/contracts" . "github.com/reiver/greatape/components/contracts/model" @@ -23,9 +22,6 @@ type documentManager struct { } func newDocumentManager(configuration IConfiguration, logger ILogger, dependencies ...ISystemComponent) IDocumentManager { - _ = ENABLE_CUSTOM_ERRORS - _ = validators.Initialize - manager := &documentManager{ systemComponent: newSystemComponent(configuration, logger), cache: NewCache(), diff --git a/components/core/identity.go b/components/core/identity.go index d742308..890a6c0 100644 --- a/components/core/identity.go +++ b/components/core/identity.go @@ -3,7 +3,6 @@ package core import ( "fmt" - "github.com/reiver/greatape/app/validators" . "github.com/reiver/greatape/components/constants" . "github.com/reiver/greatape/components/contracts" . "github.com/reiver/greatape/components/contracts/model" @@ -40,14 +39,6 @@ type identity struct { systemCallHandler func(Identity, []string) error } -// noinspection GoUnusedExportedFunction -func InitializeIdentity() { - _ = ENABLE_SECURITY - _ = ENABLE_CUSTOM_ERRORS - _ = validators.Initialize - _ = repository.Initialize -} - func NewIdentity(id int64, username string, phoneNumber string, phoneNumberConfirmed bool, firstName string, lastName string, displayName string, email string, emailConfirmed bool, avatar string, banner string, summary string, token string, multiFactor bool, hash string, salt string, publicKey string, privateKey string, permission uint64, restriction uint32, lastLogin int64, loginCount uint32) (IIdentity, error) { instance := &identity{ object: object{ diff --git a/components/core/identity_manager.go b/components/core/identity_manager.go index b4eb731..ccbcc2d 100644 --- a/components/core/identity_manager.go +++ b/components/core/identity_manager.go @@ -1,7 +1,6 @@ package core import ( - "github.com/reiver/greatape/app/validators" . "github.com/reiver/greatape/components/constants" . "github.com/reiver/greatape/components/contracts" . "github.com/reiver/greatape/components/contracts/model" @@ -24,9 +23,6 @@ type identityManager struct { } func newIdentityManager(configuration IConfiguration, logger ILogger, dependencies ...ISystemComponent) IIdentityManager { - _ = ENABLE_CUSTOM_ERRORS - _ = validators.Initialize - manager := &identityManager{ systemComponent: newSystemComponent(configuration, logger), cache: NewIdentityCache(), diff --git a/components/core/initializer.go b/components/core/initializer.go index a61d570..fb99b4c 100644 --- a/components/core/initializer.go +++ b/components/core/initializer.go @@ -5,7 +5,6 @@ import ( "crypto/sha256" "encoding/base64" "encoding/json" - "errors" "fmt" "io" "net/http" @@ -131,7 +130,7 @@ func Initialize(configuration IConfiguration, logger ILogger) error { start := time.Now() componentName := component.Name() if _, exists := componentsContainer[componentName]; exists { - return errors.New(fmt.Sprintf("%s already registered", componentName)) + return fmt.Errorf("%s already registered", componentName) } if err := component.Load(); err != nil { @@ -1318,10 +1317,7 @@ func (conductor *conductor) NewGetInboxResult(context string, id string, type_ s func (conductor *conductor) LogRemoteCall(context IContext, eventType uint32, source string, input, result interface{}, err error) { errorMessage := "" if err != nil { - errorMessage = err.Error() - if strings.HasPrefix(errorMessage, "ERROR_MESSAGE_") { - errorMessage = errorMessage[14:] - } + errorMessage = strings.TrimPrefix(err.Error(), "ERROR_MESSAGE_") } if _, marshalError := json.Marshal(input); marshalError != nil { diff --git a/components/core/object.go b/components/core/object.go index 03f99e9..c181066 100644 --- a/components/core/object.go +++ b/components/core/object.go @@ -9,9 +9,14 @@ import ( ) type object struct { - mutex sync.RWMutex - id int64 - keychain map[uint64]*semaphore + mutex sync.RWMutex + id int64 + sortOrder float32 + keychain map[uint64]*semaphore +} + +func (object *object) SortOrder() float32 { + return object.sortOrder } func (object *object) Id() int64 { diff --git a/components/core/remote_activity.go b/components/core/remote_activity.go index 47c95e4..a1115ab 100644 --- a/components/core/remote_activity.go +++ b/components/core/remote_activity.go @@ -3,8 +3,6 @@ package core import ( "fmt" - "github.com/reiver/greatape/app/validators" - . "github.com/reiver/greatape/components/constants" . "github.com/reiver/greatape/components/contracts" . "github.com/reiver/greatape/components/contracts/model" "github.com/reiver/greatape/components/model/repository" @@ -23,14 +21,6 @@ type remoteActivity struct { timestamp int64 } -// noinspection GoUnusedExportedFunction -func InitializeRemoteActivity() { - _ = ENABLE_SECURITY - _ = ENABLE_CUSTOM_ERRORS - _ = validators.Initialize - _ = repository.Initialize -} - func NewRemoteActivity(id int64, entryPoint string, duration int64, successful bool, errorMessage string, remoteAddress string, userAgent string, eventType uint32, timestamp int64) (IRemoteActivity, error) { instance := &remoteActivity{ object: object{ diff --git a/components/core/remote_activity_manager.go b/components/core/remote_activity_manager.go index ce6bd92..acac640 100644 --- a/components/core/remote_activity_manager.go +++ b/components/core/remote_activity_manager.go @@ -1,7 +1,6 @@ package core import ( - "github.com/reiver/greatape/app/validators" . "github.com/reiver/greatape/components/constants" . "github.com/reiver/greatape/components/contracts" . "github.com/reiver/greatape/components/contracts/model" @@ -23,9 +22,6 @@ type remoteActivityManager struct { } func newRemoteActivityManager(configuration IConfiguration, logger ILogger, dependencies ...ISystemComponent) IRemoteActivityManager { - _ = ENABLE_CUSTOM_ERRORS - _ = validators.Initialize - manager := &remoteActivityManager{ systemComponent: newSystemComponent(configuration, logger), cache: NewCache(), diff --git a/components/core/spi.go b/components/core/spi.go index 6e9177a..c2ab038 100644 --- a/components/core/spi.go +++ b/components/core/spi.go @@ -3,24 +3,12 @@ package core import ( "fmt" - "github.com/reiver/greatape/app/validators" - . "github.com/reiver/greatape/components/constants" . "github.com/reiver/greatape/components/contracts" - "github.com/reiver/greatape/components/model/repository" - . "github.com/xeronith/diamante/contracts/security" ) type spi struct { } -// noinspection GoUnusedExportedFunction -func InitializeSpi() { - _ = ENABLE_SECURITY - _ = ENABLE_CUSTOM_ERRORS - _ = validators.Initialize - _ = repository.Initialize -} - func NewSpi() (ISpi, error) { instance := &spi{} diff --git a/components/core/spi_manager.go b/components/core/spi_manager.go index 4ccce8c..0b6f9c0 100644 --- a/components/core/spi_manager.go +++ b/components/core/spi_manager.go @@ -21,9 +21,6 @@ type spiManager struct { } func newSpiManager(configuration IConfiguration, logger ILogger, dependencies ...ISystemComponent) ISpiManager { - _ = ENABLE_CUSTOM_ERRORS - _ = validators.Initialize - manager := &spiManager{ systemComponent: newSystemComponent(configuration, logger), cache: NewCache(), diff --git a/components/core/system_dispatcher.go b/components/core/system_dispatcher.go index 6fa3ff0..25e24fc 100644 --- a/components/core/system_dispatcher.go +++ b/components/core/system_dispatcher.go @@ -228,7 +228,7 @@ func (dispatcher *dispatcher) Format(format string, args ...interface{}) string return fmt.Sprintf(format, args...) } -func (dispatcher *dispatcher) Sort(slice interface{}, less func(a, b int) bool) { +func (dispatcher *dispatcher) Sort(slice interface{}, less func(x, y int) bool) { sort.Slice(slice, less) } diff --git a/components/core/system_schedule.go b/components/core/system_schedule.go index 236f7f2..b70f2de 100644 --- a/components/core/system_schedule.go +++ b/components/core/system_schedule.go @@ -3,8 +3,6 @@ package core import ( "fmt" - "github.com/reiver/greatape/app/validators" - . "github.com/reiver/greatape/components/constants" . "github.com/reiver/greatape/components/contracts" . "github.com/reiver/greatape/components/contracts/model" "github.com/reiver/greatape/components/model/repository" @@ -17,14 +15,6 @@ type systemSchedule struct { config string } -// noinspection GoUnusedExportedFunction -func InitializeSystemSchedule() { - _ = ENABLE_SECURITY - _ = ENABLE_CUSTOM_ERRORS - _ = validators.Initialize - _ = repository.Initialize -} - func NewSystemSchedule(id int64, enabled bool, config string) (ISystemSchedule, error) { instance := &systemSchedule{ object: object{ diff --git a/components/core/system_schedule_manager.go b/components/core/system_schedule_manager.go index d84df2f..12d8b58 100644 --- a/components/core/system_schedule_manager.go +++ b/components/core/system_schedule_manager.go @@ -1,7 +1,6 @@ package core import ( - "github.com/reiver/greatape/app/validators" . "github.com/reiver/greatape/components/constants" . "github.com/reiver/greatape/components/contracts" . "github.com/reiver/greatape/components/contracts/model" @@ -23,9 +22,6 @@ type systemScheduleManager struct { } func newSystemScheduleManager(configuration IConfiguration, logger ILogger, dependencies ...ISystemComponent) ISystemScheduleManager { - _ = ENABLE_CUSTOM_ERRORS - _ = validators.Initialize - manager := &systemScheduleManager{ systemComponent: newSystemComponent(configuration, logger), cache: NewCache(), diff --git a/components/core/user.go b/components/core/user.go index 8a0567b..ab0daa1 100644 --- a/components/core/user.go +++ b/components/core/user.go @@ -3,8 +3,6 @@ package core import ( "fmt" - "github.com/reiver/greatape/app/validators" - . "github.com/reiver/greatape/components/constants" . "github.com/reiver/greatape/components/contracts" . "github.com/reiver/greatape/components/contracts/model" "github.com/reiver/greatape/components/model/repository" @@ -16,14 +14,6 @@ type user struct { github string } -// noinspection GoUnusedExportedFunction -func InitializeUser() { - _ = ENABLE_SECURITY - _ = ENABLE_CUSTOM_ERRORS - _ = validators.Initialize - _ = repository.Initialize -} - func NewUser(id int64, github string) (IUser, error) { instance := &user{ object: object{ diff --git a/components/core/user_manager.go b/components/core/user_manager.go index f9274c2..6ffe3dd 100644 --- a/components/core/user_manager.go +++ b/components/core/user_manager.go @@ -1,7 +1,6 @@ package core import ( - "github.com/reiver/greatape/app/validators" . "github.com/reiver/greatape/components/constants" . "github.com/reiver/greatape/components/contracts" . "github.com/reiver/greatape/components/contracts/model" @@ -23,9 +22,6 @@ type userManager struct { } func newUserManager(configuration IConfiguration, logger ILogger, dependencies ...ISystemComponent) IUserManager { - _ = ENABLE_CUSTOM_ERRORS - _ = validators.Initialize - manager := &userManager{ systemComponent: newSystemComponent(configuration, logger), cache: NewCache(), diff --git a/components/model/entity/access_control_entity.go b/components/model/entity/access_control_entity.go index e1424f6..d1319d5 100644 --- a/components/model/entity/access_control_entity.go +++ b/components/model/entity/access_control_entity.go @@ -5,19 +5,12 @@ import ( "reflect" "time" - "github.com/reiver/greatape/app/validators" . "github.com/reiver/greatape/components/constants" . "github.com/reiver/greatape/components/contracts/model" ) var AccessControlEntityType = reflect.TypeOf(accessControlEntity{}) -// noinspection GoUnusedExportedFunction -func InitializeAccessControlEntity() { - _ = ENABLE_CUSTOM_ERRORS - _ = validators.Initialize -} - type accessControlEntity struct { entity KeyField uint64 `json:"key" storage:"BIGINT" default:"0"` diff --git a/components/model/entity/activity_pub_follower_entity.go b/components/model/entity/activity_pub_follower_entity.go index 4a83fb1..88c674e 100644 --- a/components/model/entity/activity_pub_follower_entity.go +++ b/components/model/entity/activity_pub_follower_entity.go @@ -5,19 +5,12 @@ import ( "reflect" "time" - "github.com/reiver/greatape/app/validators" . "github.com/reiver/greatape/components/constants" . "github.com/reiver/greatape/components/contracts/model" ) var ActivityPubFollowerEntityType = reflect.TypeOf(activityPubFollowerEntity{}) -// noinspection GoUnusedExportedFunction -func InitializeActivityPubFollowerEntity() { - _ = ENABLE_CUSTOM_ERRORS - _ = validators.Initialize -} - type activityPubFollowerEntity struct { entity HandleField string `json:"handle" storage:"VARCHAR(256)" default:"''"` diff --git a/components/model/entity/activity_pub_incoming_activity_entity.go b/components/model/entity/activity_pub_incoming_activity_entity.go index ee3b6eb..abcfb6c 100644 --- a/components/model/entity/activity_pub_incoming_activity_entity.go +++ b/components/model/entity/activity_pub_incoming_activity_entity.go @@ -5,19 +5,12 @@ import ( "reflect" "time" - "github.com/reiver/greatape/app/validators" . "github.com/reiver/greatape/components/constants" . "github.com/reiver/greatape/components/contracts/model" ) var ActivityPubIncomingActivityEntityType = reflect.TypeOf(activityPubIncomingActivityEntity{}) -// noinspection GoUnusedExportedFunction -func InitializeActivityPubIncomingActivityEntity() { - _ = ENABLE_CUSTOM_ERRORS - _ = validators.Initialize -} - type activityPubIncomingActivityEntity struct { entity IdentityIdField int64 `json:"identity_id"` diff --git a/components/model/entity/activity_pub_outgoing_activity_entity.go b/components/model/entity/activity_pub_outgoing_activity_entity.go index 3530a9c..53a4512 100644 --- a/components/model/entity/activity_pub_outgoing_activity_entity.go +++ b/components/model/entity/activity_pub_outgoing_activity_entity.go @@ -5,19 +5,12 @@ import ( "reflect" "time" - "github.com/reiver/greatape/app/validators" . "github.com/reiver/greatape/components/constants" . "github.com/reiver/greatape/components/contracts/model" ) var ActivityPubOutgoingActivityEntityType = reflect.TypeOf(activityPubOutgoingActivityEntity{}) -// noinspection GoUnusedExportedFunction -func InitializeActivityPubOutgoingActivityEntity() { - _ = ENABLE_CUSTOM_ERRORS - _ = validators.Initialize -} - type activityPubOutgoingActivityEntity struct { entity IdentityIdField int64 `json:"identity_id"` diff --git a/components/model/entity/category_entity.go b/components/model/entity/category_entity.go index 626b38e..5be9c0b 100644 --- a/components/model/entity/category_entity.go +++ b/components/model/entity/category_entity.go @@ -5,19 +5,12 @@ import ( "reflect" "time" - "github.com/reiver/greatape/app/validators" . "github.com/reiver/greatape/components/constants" . "github.com/reiver/greatape/components/contracts/model" ) var CategoryEntityType = reflect.TypeOf(categoryEntity{}) -// noinspection GoUnusedExportedFunction -func InitializeCategoryEntity() { - _ = ENABLE_CUSTOM_ERRORS - _ = validators.Initialize -} - type categoryEntity struct { entity CategoryTypeIdField int64 `json:"category_type_id"` diff --git a/components/model/entity/category_type_entity.go b/components/model/entity/category_type_entity.go index 7620272..129ed4c 100644 --- a/components/model/entity/category_type_entity.go +++ b/components/model/entity/category_type_entity.go @@ -5,19 +5,12 @@ import ( "reflect" "time" - "github.com/reiver/greatape/app/validators" . "github.com/reiver/greatape/components/constants" . "github.com/reiver/greatape/components/contracts/model" ) var CategoryTypeEntityType = reflect.TypeOf(categoryTypeEntity{}) -// noinspection GoUnusedExportedFunction -func InitializeCategoryTypeEntity() { - _ = ENABLE_CUSTOM_ERRORS - _ = validators.Initialize -} - type categoryTypeEntity struct { entity DescriptionField string `json:"description" storage:"VARCHAR(64)" default:"''"` diff --git a/components/model/entity/document_entity.go b/components/model/entity/document_entity.go index 83ad8bf..10699c4 100644 --- a/components/model/entity/document_entity.go +++ b/components/model/entity/document_entity.go @@ -5,19 +5,12 @@ import ( "reflect" "time" - "github.com/reiver/greatape/app/validators" . "github.com/reiver/greatape/components/constants" . "github.com/reiver/greatape/components/contracts/model" ) var DocumentEntityType = reflect.TypeOf(documentEntity{}) -// noinspection GoUnusedExportedFunction -func InitializeDocumentEntity() { - _ = ENABLE_CUSTOM_ERRORS - _ = validators.Initialize -} - type documentEntity struct { entity ContentField string `json:"content" storage:"JSONB" default:"'{}'"` diff --git a/components/model/entity/entity.go b/components/model/entity/entity.go index 6ed24bf..4474684 100644 --- a/components/model/entity/entity.go +++ b/components/model/entity/entity.go @@ -1,14 +1,23 @@ package entity type entity struct { - IdField int64 `json:"id"` - PayloadField string `json:"payload"` + IdField int64 `json:"id"` + SortOrderField float32 `json:"sort_order"` + PayloadField string `json:"payload"` } func (entity *entity) Id() int64 { return entity.IdField } +func (entity *entity) SortOrder() float32 { + return entity.SortOrderField +} + +func (entity *entity) SetSortOrder(sortOrder float32) { + entity.SortOrderField = sortOrder +} + func (entity *entity) Payload() string { if entity.PayloadField == "" { entity.PayloadField = "{}" diff --git a/components/model/entity/identity_entity.go b/components/model/entity/identity_entity.go index 3cef262..2d9cf49 100644 --- a/components/model/entity/identity_entity.go +++ b/components/model/entity/identity_entity.go @@ -5,19 +5,12 @@ import ( "reflect" "time" - "github.com/reiver/greatape/app/validators" . "github.com/reiver/greatape/components/constants" . "github.com/reiver/greatape/components/contracts/model" ) var IdentityEntityType = reflect.TypeOf(identityEntity{}) -// noinspection GoUnusedExportedFunction -func InitializeIdentityEntity() { - _ = ENABLE_CUSTOM_ERRORS - _ = validators.Initialize -} - type identityEntity struct { entity UsernameField string `json:"username" storage:"VARCHAR(32)" default:"''"` diff --git a/components/model/entity/remote_activity_entity.go b/components/model/entity/remote_activity_entity.go index 5d68a79..225a7d2 100644 --- a/components/model/entity/remote_activity_entity.go +++ b/components/model/entity/remote_activity_entity.go @@ -5,19 +5,12 @@ import ( "reflect" "time" - "github.com/reiver/greatape/app/validators" . "github.com/reiver/greatape/components/constants" . "github.com/reiver/greatape/components/contracts/model" ) var RemoteActivityEntityType = reflect.TypeOf(remoteActivityEntity{}) -// noinspection GoUnusedExportedFunction -func InitializeRemoteActivityEntity() { - _ = ENABLE_CUSTOM_ERRORS - _ = validators.Initialize -} - type remoteActivityEntity struct { entity EntryPointField string `json:"entry_point" storage:"VARCHAR(256)" default:"''"` diff --git a/components/model/entity/system_schedule_entity.go b/components/model/entity/system_schedule_entity.go index 1494527..2b3e7db 100644 --- a/components/model/entity/system_schedule_entity.go +++ b/components/model/entity/system_schedule_entity.go @@ -5,19 +5,12 @@ import ( "reflect" "time" - "github.com/reiver/greatape/app/validators" . "github.com/reiver/greatape/components/constants" . "github.com/reiver/greatape/components/contracts/model" ) var SystemScheduleEntityType = reflect.TypeOf(systemScheduleEntity{}) -// noinspection GoUnusedExportedFunction -func InitializeSystemScheduleEntity() { - _ = ENABLE_CUSTOM_ERRORS - _ = validators.Initialize -} - type systemScheduleEntity struct { entity EnabledField bool `json:"enabled" storage:"BOOLEAN" default:"FALSE"` diff --git a/components/model/entity/user_entity.go b/components/model/entity/user_entity.go index 2f91199..c2abf8c 100644 --- a/components/model/entity/user_entity.go +++ b/components/model/entity/user_entity.go @@ -5,19 +5,12 @@ import ( "reflect" "time" - "github.com/reiver/greatape/app/validators" . "github.com/reiver/greatape/components/constants" . "github.com/reiver/greatape/components/contracts/model" ) var UserEntityType = reflect.TypeOf(userEntity{}) -// noinspection GoUnusedExportedFunction -func InitializeUserEntity() { - _ = ENABLE_CUSTOM_ERRORS - _ = validators.Initialize -} - type userEntity struct { entity GithubField string `json:"github" storage:"VARCHAR(512)" default:"''"`