diff --git a/.gitignore b/.gitignore index 6c1c84f7..904bf42a 100644 --- a/.gitignore +++ b/.gitignore @@ -20,6 +20,6 @@ vendor/ # Go workspace file go.work settings.yaml - +.vscode .idea diff --git a/go.mod b/go.mod index 0c33aba7..75900ffa 100644 --- a/go.mod +++ b/go.mod @@ -33,9 +33,6 @@ require ( require ( dario.cat/mergo v1.0.0 // indirect github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect - github.com/Masterminds/goutils v1.1.1 // indirect - github.com/Masterminds/semver/v3 v3.1.1 // indirect - github.com/Masterminds/sprig/v3 v3.2.2 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/Microsoft/hcsshim v0.11.4 // indirect github.com/Shopify/sarama v1.38.1 // indirect @@ -63,7 +60,6 @@ require ( github.com/eapache/go-resiliency v1.3.0 // indirect github.com/eapache/go-xerial-snappy v0.0.0-20230111030713-bf00bc1b83b6 // indirect github.com/eapache/queue v1.1.0 // indirect - github.com/fsnotify/fsnotify v1.6.0 // indirect github.com/go-ole/go-ole v1.2.6 // indirect github.com/gofrs/uuid v4.3.0+incompatible // indirect github.com/gogo/protobuf v1.3.2 // indirect @@ -75,11 +71,7 @@ require ( github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/hashicorp/go-uuid v1.0.3 // indirect github.com/hashicorp/golang-lru/v2 v2.0.3 // indirect - github.com/hashicorp/hcl v1.0.0 // indirect github.com/holiman/uint256 v1.2.3 // indirect - github.com/huandu/xstrings v1.3.2 // indirect - github.com/imdario/mergo v0.3.16 // indirect - github.com/inconshreveable/mousetrap v1.0.1 // indirect github.com/jcmturner/aescts/v2 v2.0.0 // indirect github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect github.com/jcmturner/gofork v1.7.6 // indirect @@ -93,9 +85,7 @@ require ( github.com/mattn/go-isatty v0.0.20 // indirect github.com/mattn/go-runewidth v0.0.15 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect - github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect - github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/moby/patternmatcher v0.5.0 // indirect github.com/moby/sys/sequential v0.5.0 // indirect github.com/moby/term v0.5.0 // indirect @@ -103,8 +93,6 @@ require ( github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.1.0-rc5 // indirect github.com/opencontainers/runc v1.1.12 // indirect - github.com/pelletier/go-toml v1.9.5 // indirect - github.com/pelletier/go-toml/v2 v2.0.5 // indirect github.com/pierrec/lz4/v4 v4.1.18 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect @@ -116,16 +104,9 @@ require ( github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/shirou/gopsutil/v3 v3.23.8 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect - github.com/shopspring/decimal v1.3.1 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/sosodev/duration v1.1.0 // indirect - github.com/spf13/afero v1.9.2 // indirect github.com/spf13/cast v1.5.0 // indirect - github.com/spf13/cobra v1.5.0 // indirect - github.com/spf13/jwalterweatherman v1.1.0 // indirect - github.com/spf13/pflag v1.0.5 // indirect - github.com/spf13/viper v1.12.0 // indirect - github.com/subosito/gotenv v1.4.1 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/urfave/cli/v2 v2.25.7 // indirect @@ -147,7 +128,5 @@ require ( google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b // indirect google.golang.org/grpc v1.59.0 // indirect google.golang.org/protobuf v1.31.0 // indirect - gopkg.in/ini.v1 v1.67.0 // indirect - gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 540c5ae6..28fd711c 100644 --- a/go.sum +++ b/go.sum @@ -75,11 +75,8 @@ github.com/DIMO-Network/mnemonic v0.0.0-20240226173518-343f1791b339/go.mod h1:CT github.com/DIMO-Network/shared v0.10.5 h1:hud/AdSCG0E3GpjIo1uHGIXO2cilTwo3q8l8uk/P6kU= github.com/DIMO-Network/shared v0.10.5/go.mod h1:sfeTTaAf4Y5aU15yGTksdZejJP+X6M2n2M70Qm5+Rqk= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= -github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI= github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= -github.com/Masterminds/semver/v3 v3.1.1 h1:hLg3sBzpNErnxhQtUy/mmLR2I9foDujNK030IGemrRc= github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= -github.com/Masterminds/sprig/v3 v3.2.2 h1:17jRggJu518dr3QaafizSXOjKYp94wKfABxUmyxvxX8= github.com/Masterminds/sprig/v3 v3.2.2/go.mod h1:UoaO7Yp8KlPnJIYWTFkMaqPUYKTfGFPhxNuwnnxkKlk= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= @@ -220,8 +217,6 @@ github.com/frankban/quicktest v1.14.3/go.mod h1:mgiwOwqx65TmIk1wJ6Q7wvnVMocbUork github.com/friendsofgo/errors v0.9.2 h1:X6NYxef4efCBdwI7BgS820zFaN7Cphrmb+Pljdzjtgk= github.com/friendsofgo/errors v0.9.2/go.mod h1:yCvFW5AkDIL9qn7suHVLiI/gH228n7PC4Pn44IGoTOI= github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU= -github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= -github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= @@ -383,7 +378,6 @@ github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/golang-lru/v2 v2.0.3 h1:kmRrRLlInXvng0SmLxmQpQkpbYAvcXm7NPDrgxJa9mE= github.com/hashicorp/golang-lru/v2 v2.0.3/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM= -github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc= @@ -393,16 +387,12 @@ github.com/hashicorp/serf v0.9.7/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpT github.com/holiman/uint256 v1.2.3 h1:K8UWO1HUJpRMXBxbmaY1Y8IAMZC/RsKB+ArEnnK4l5o= github.com/holiman/uint256 v1.2.3/go.mod h1:SC8Ryt4n+UBbPbIBKaG9zbbDlp4jOru9xFZmPzLUTxw= github.com/huandu/xstrings v1.3.1/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= -github.com/huandu/xstrings v1.3.2 h1:L18LIDzqlW6xN2rEkpdV8+oL/IXWJ1APd+vsdYy4Wdw= github.com/huandu/xstrings v1.3.2/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg= -github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4= -github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc= github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/jarcoal/httpmock v1.3.1 h1:iUx3whfZWVf3jT01hQTO/Eo5sAYtB2/rqaUuOtpInww= github.com/jarcoal/httpmock v1.3.1/go.mod h1:3yb8rc4BI7TCBhFY8ng0gjuLKJNquuDNiPaZjnENuYg= @@ -490,7 +480,6 @@ github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKju github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= -github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw= github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= @@ -500,7 +489,6 @@ github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RR github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= -github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/moby/patternmatcher v0.5.0 h1:YCZgJOeULcxLw1Q+sVR636pmS7sPEn1Qo2iAN6M7DBo= github.com/moby/patternmatcher v0.5.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc= @@ -527,10 +515,8 @@ github.com/opencontainers/runc v1.1.12 h1:BOIssBaW1La0/qbNZHXOOa71dZfZEQOzW7dqQf github.com/opencontainers/runc v1.1.12/go.mod h1:S+lQwSfncpBha7XTy/5lBwWgm5+y5Ma/O44Ekby9FK8= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= -github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pelletier/go-toml/v2 v2.0.1/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo= -github.com/pelletier/go-toml/v2 v2.0.5 h1:ipoSadvV8oGUjnUbMub59IDPPwfxF694nG/jwbMiyQg= github.com/pelletier/go-toml/v2 v2.0.5/go.mod h1:OMHamSCAODeSsVrwwvcJOaoN0LIUIaFVNZzmWyNfXas= github.com/pierrec/lz4/v4 v4.1.18 h1:xaKrnTkyoqfh1YItXl56+6KJNVYWlEEPuAQW9xsplYQ= github.com/pierrec/lz4/v4 v4.1.18/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= @@ -606,7 +592,6 @@ github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU= github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k= github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4= github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= -github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8= github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= @@ -617,18 +602,13 @@ github.com/sosodev/duration v1.1.0 h1:kQcaiGbJaIsRqgQy7VGlZrVw1giWO+lDoX3MCPnpVO github.com/sosodev/duration v1.1.0/go.mod h1:RQIBBX0+fMLc/D9+Jb/fwvVmo0eZvDDEERAikUR6SDg= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo= -github.com/spf13/afero v1.9.2 h1:j49Hj62F0n+DaZ1dDCvhABaPNSGNkt32oRFxI33IEMw= github.com/spf13/afero v1.9.2/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y= github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= -github.com/spf13/cobra v1.5.0 h1:X+jTBEBqF0bHN+9cSMgmfuvv2VHJ9ezmFNf9Y/XstYU= github.com/spf13/cobra v1.5.0/go.mod h1:dWXEIy2H428czQCjInthrTRUg7yKbok+2Qi/yBIJoUM= -github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= -github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.12.0 h1:CZ7eSOd3kZoaYDLbXnmzgQI5RlciuXBMA+18HwHRfZQ= github.com/spf13/viper v1.12.0/go.mod h1:b6COn30jlNxbm/V2IqWiNWkJ+vZNiMNksliPCiuKtSI= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -646,7 +626,6 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/subosito/gotenv v1.3.0/go.mod h1:YzJjq/33h7nrwdY+iHMhEOEEbW0ovIz0tB6t6PwAXzs= -github.com/subosito/gotenv v1.4.1 h1:jyEFiXpy21Wm81FBN71l9VoMMV8H8jG+qIK3GCpY6Qs= github.com/subosito/gotenv v1.4.1/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= github.com/testcontainers/testcontainers-go v0.25.0 h1:erH6cQjsaJrH+rJDU9qIf89KFdhK0Bft0aEZHlYC3Vs= github.com/testcontainers/testcontainers-go v0.25.0/go.mod h1:4sC9SiJyzD1XFi59q8umTQYWxnkweEc5OjVtTUlJzqQ= @@ -675,13 +654,9 @@ github.com/volatiletech/null/v8 v8.1.2 h1:kiTiX1PpwvuugKwfvUNX/SU/5A2KGZMXfGD0DU github.com/volatiletech/null/v8 v8.1.2/go.mod h1:98DbwNoKEpRrYtGjWFctievIfm4n4MxG0A6EBUcoS5g= github.com/volatiletech/randomize v0.0.1 h1:eE5yajattWqTB2/eN8df4dw+8jwAzBtbdo5sbWC4nMk= github.com/volatiletech/randomize v0.0.1/go.mod h1:GN3U0QYqfZ9FOJ67bzax1cqZ5q2xuj2mXrXBjWaRTlY= -github.com/volatiletech/sqlboiler/v4 v4.15.0 h1:+twm3mA34SaUF6wB9U6QkXxkK8AKkV5EfgMSvcKWeY4= -github.com/volatiletech/sqlboiler/v4 v4.15.0/go.mod h1:s643wqYyCQ7Ak2hMVxH7kTS0+lFPNlj+gHKUIukJ0YA= github.com/volatiletech/sqlboiler/v4 v4.16.2 h1:PcV2bxjE+S+GwPKCyX7/AjlY3aiTKsOEjciLhpWQImc= github.com/volatiletech/sqlboiler/v4 v4.16.2/go.mod h1:B14BPBGTrJ2X6l7lwnvV/iXgYR48+ozGSlzHI3frl6U= github.com/volatiletech/strmangle v0.0.1/go.mod h1:F6RA6IkB5vq0yTG4GQ0UsbbRcl3ni9P76i+JrTBKFFg= -github.com/volatiletech/strmangle v0.0.5 h1:CompJPy+lAi9h+YU/IzBR4X2RDRuAuEIP+kjFdyZXcU= -github.com/volatiletech/strmangle v0.0.5/go.mod h1:ycDvbDkjDvhC0NUU8w3fWwl5JEMTV56vTKXzR3GeR+0= github.com/volatiletech/strmangle v0.0.6 h1:AdOYE3B2ygRDq4rXDij/MMwq6KVK/pWAYxpC7CLrkKQ= github.com/volatiletech/strmangle v0.0.6/go.mod h1:ycDvbDkjDvhC0NUU8w3fWwl5JEMTV56vTKXzR3GeR+0= github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU= @@ -941,7 +916,6 @@ golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220825204002-c680a09ffe64/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1218,7 +1192,6 @@ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EV gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/ini.v1 v1.66.4/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/graph/generated.go b/graph/generated.go index 332d31c0..7e056be5 100644 --- a/graph/generated.go +++ b/graph/generated.go @@ -137,11 +137,6 @@ type ComplexityRoot struct { Week func(childComplexity int) int } - Earnings struct { - EarnedTokens func(childComplexity int) int - EarningsTransfers func(childComplexity int, first *int) int - } - EarningsConnection struct { Edges func(childComplexity int) int Nodes func(childComplexity int) int @@ -699,25 +694,6 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in return e.complexity.Earning.Week(childComplexity), true - case "Earnings.earnedTokens": - if e.complexity.Earnings.EarnedTokens == nil { - break - } - - return e.complexity.Earnings.EarnedTokens(childComplexity), true - - case "Earnings.earningsTransfers": - if e.complexity.Earnings.EarningsTransfers == nil { - break - } - - args, err := ec.field_Earnings_earningsTransfers_args(context.TODO(), rawArgs) - if err != nil { - return 0, false - } - - return e.complexity.Earnings.EarningsTransfers(childComplexity, args["first"].(*int)), true - case "EarningsConnection.edges": if e.complexity.EarningsConnection.Edges == nil { break @@ -1471,21 +1447,6 @@ func (ec *executionContext) field_AftermarketDeviceEarnings_history_args(ctx con return args, nil } -func (ec *executionContext) field_Earnings_earningsTransfers_args(ctx context.Context, rawArgs map[string]interface{}) (map[string]interface{}, error) { - var err error - args := map[string]interface{}{} - var arg0 *int - if tmp, ok := rawArgs["first"]; ok { - ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("first")) - arg0, err = ec.unmarshalOInt2ᚖint(ctx, tmp) - if err != nil { - return nil, err - } - } - args["first"] = arg0 - return args, nil -} - func (ec *executionContext) field_Manufacturer_aftermarketDevices_args(ctx context.Context, rawArgs map[string]interface{}) (map[string]interface{}, error) { var err error args := map[string]interface{}{} @@ -4533,115 +4494,6 @@ func (ec *executionContext) fieldContext_Earning_sentAt(ctx context.Context, fie return fc, nil } -func (ec *executionContext) _Earnings_earnedTokens(ctx context.Context, field graphql.CollectedField, obj *model.Earnings) (ret graphql.Marshaler) { - fc, err := ec.fieldContext_Earnings_earnedTokens(ctx, field) - if err != nil { - return graphql.Null - } - ctx = graphql.WithFieldContext(ctx, fc) - defer func() { - if r := recover(); r != nil { - ec.Error(ctx, ec.Recover(ctx, r)) - ret = graphql.Null - } - }() - resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) { - ctx = rctx // use context from middleware stack in children - return obj.EarnedTokens, nil - }) - if err != nil { - ec.Error(ctx, err) - return graphql.Null - } - if resTmp == nil { - if !graphql.HasFieldError(ctx, fc) { - ec.Errorf(ctx, "must not be null") - } - return graphql.Null - } - res := resTmp.(*big.Int) - fc.Result = res - return ec.marshalNBigInt2ᚖmathᚋbigᚐInt(ctx, field.Selections, res) -} - -func (ec *executionContext) fieldContext_Earnings_earnedTokens(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { - fc = &graphql.FieldContext{ - Object: "Earnings", - Field: field, - IsMethod: false, - IsResolver: false, - Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - return nil, errors.New("field of type BigInt does not have child fields") - }, - } - return fc, nil -} - -func (ec *executionContext) _Earnings_earningsTransfers(ctx context.Context, field graphql.CollectedField, obj *model.Earnings) (ret graphql.Marshaler) { - fc, err := ec.fieldContext_Earnings_earningsTransfers(ctx, field) - if err != nil { - return graphql.Null - } - ctx = graphql.WithFieldContext(ctx, fc) - defer func() { - if r := recover(); r != nil { - ec.Error(ctx, ec.Recover(ctx, r)) - ret = graphql.Null - } - }() - resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) { - ctx = rctx // use context from middleware stack in children - return obj.EarningsTransfers, nil - }) - if err != nil { - ec.Error(ctx, err) - return graphql.Null - } - if resTmp == nil { - if !graphql.HasFieldError(ctx, fc) { - ec.Errorf(ctx, "must not be null") - } - return graphql.Null - } - res := resTmp.(*model.EarningsConnection) - fc.Result = res - return ec.marshalNEarningsConnection2ᚖgithubᚗcomᚋDIMOᚑNetworkᚋidentityᚑapiᚋgraphᚋmodelᚐEarningsConnection(ctx, field.Selections, res) -} - -func (ec *executionContext) fieldContext_Earnings_earningsTransfers(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { - fc = &graphql.FieldContext{ - Object: "Earnings", - Field: field, - IsMethod: false, - IsResolver: false, - Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - switch field.Name { - case "totalCount": - return ec.fieldContext_EarningsConnection_totalCount(ctx, field) - case "edges": - return ec.fieldContext_EarningsConnection_edges(ctx, field) - case "nodes": - return ec.fieldContext_EarningsConnection_nodes(ctx, field) - case "pageInfo": - return ec.fieldContext_EarningsConnection_pageInfo(ctx, field) - } - return nil, fmt.Errorf("no field named %q was found under type EarningsConnection", field.Name) - }, - } - defer func() { - if r := recover(); r != nil { - err = ec.Recover(ctx, r) - ec.Error(ctx, err) - } - }() - ctx = graphql.WithFieldContext(ctx, fc) - if fc.Args, err = ec.field_Earnings_earningsTransfers_args(ctx, field.ArgumentMap(ec.Variables)); err != nil { - ec.Error(ctx, err) - return fc, err - } - return fc, nil -} - func (ec *executionContext) _EarningsConnection_totalCount(ctx context.Context, field graphql.CollectedField, obj *model.EarningsConnection) (ret graphql.Marshaler) { fc, err := ec.fieldContext_EarningsConnection_totalCount(ctx, field) if err != nil { @@ -11710,50 +11562,6 @@ func (ec *executionContext) _Earning(ctx context.Context, sel ast.SelectionSet, return out } -var earningsImplementors = []string{"Earnings"} - -func (ec *executionContext) _Earnings(ctx context.Context, sel ast.SelectionSet, obj *model.Earnings) graphql.Marshaler { - fields := graphql.CollectFields(ec.OperationContext, sel, earningsImplementors) - - out := graphql.NewFieldSet(fields) - deferred := make(map[string]*graphql.FieldSet) - for i, field := range fields { - switch field.Name { - case "__typename": - out.Values[i] = graphql.MarshalString("Earnings") - case "earnedTokens": - out.Values[i] = ec._Earnings_earnedTokens(ctx, field, obj) - if out.Values[i] == graphql.Null { - out.Invalids++ - } - case "earningsTransfers": - out.Values[i] = ec._Earnings_earningsTransfers(ctx, field, obj) - if out.Values[i] == graphql.Null { - out.Invalids++ - } - default: - panic("unknown field " + strconv.Quote(field.Name)) - } - } - out.Dispatch(ctx) - if out.Invalids > 0 { - return graphql.Null - } - - atomic.AddInt32(&ec.deferred, int32(len(deferred))) - - for label, dfs := range deferred { - ec.processDeferredGroup(graphql.DeferredGroup{ - Label: label, - Path: graphql.GetPath(ctx), - FieldSet: dfs, - Context: ctx, - }) - } - - return out -} - var earningsConnectionImplementors = []string{"EarningsConnection"} func (ec *executionContext) _EarningsConnection(ctx context.Context, sel ast.SelectionSet, obj *model.EarningsConnection) graphql.Marshaler { diff --git a/graph/model/models_gen.go b/graph/model/models_gen.go index c6987b23..a30dce75 100644 --- a/graph/model/models_gen.go +++ b/graph/model/models_gen.go @@ -179,11 +179,6 @@ type Earning struct { VehicleID int `json:"-"` } -type Earnings struct { - EarnedTokens *big.Int `json:"earnedTokens"` - EarningsTransfers *EarningsConnection `json:"earningsTransfers"` -} - type EarningsConnection struct { TotalCount int `json:"totalCount"` Edges []*EarningsEdge `json:"edges"` diff --git a/graph/rewards_test.go b/graph/rewards_test.go index ca015622..16fb944c 100644 --- a/graph/rewards_test.go +++ b/graph/rewards_test.go @@ -23,6 +23,7 @@ import ( "github.com/testcontainers/testcontainers-go" "github.com/volatiletech/null/v8" "github.com/volatiletech/sqlboiler/v4/boil" + "github.com/volatiletech/sqlboiler/v4/types" ) type RewardsQueryTestSuite struct { @@ -129,11 +130,11 @@ func (r *RewardsQueryTestSuite) Test_Query_GetEarningsByVehicle_FwdPaginate() { IssuanceWeek: 2, VehicleID: 1, ConnectionStreak: null.IntFrom(20), - StreakEarnings: dbtypes.NullIntToDecimal(strkEarn), + StreakEarnings: dbtypes.IntToDecimal(strkEarn), AftermarketTokenID: null.IntFrom(1), - AftermarketEarnings: dbtypes.NullIntToDecimal(adEarn), + AftermarketEarnings: dbtypes.IntToDecimal(adEarn), SyntheticTokenID: null.IntFrom(1), - SyntheticEarnings: dbtypes.NullIntToDecimal(synthEarn), + SyntheticEarnings: dbtypes.IntToDecimal(synthEarn), ReceivedByAddress: null.BytesFrom(beneficiary.Bytes()), EarnedAt: currTime, } @@ -278,11 +279,11 @@ func (r *RewardsQueryTestSuite) Test_Query_GetEarningsByVehicle_FwdPaginate_Firs IssuanceWeek: 2, VehicleID: 1, ConnectionStreak: null.IntFrom(12), - StreakEarnings: dbtypes.NullIntToDecimal(strkEarn), + StreakEarnings: dbtypes.IntToDecimal(strkEarn), AftermarketTokenID: null.IntFrom(1), - AftermarketEarnings: dbtypes.NullIntToDecimal(adEarn), + AftermarketEarnings: dbtypes.IntToDecimal(adEarn), SyntheticTokenID: null.IntFrom(1), - SyntheticEarnings: dbtypes.NullIntToDecimal(synthEarn), + SyntheticEarnings: dbtypes.IntToDecimal(synthEarn), ReceivedByAddress: null.BytesFrom(beneficiary.Bytes()), EarnedAt: currTime, }, @@ -290,11 +291,11 @@ func (r *RewardsQueryTestSuite) Test_Query_GetEarningsByVehicle_FwdPaginate_Firs IssuanceWeek: 3, VehicleID: 1, ConnectionStreak: null.IntFrom(13), - StreakEarnings: dbtypes.NullIntToDecimal(strkEarn), + StreakEarnings: dbtypes.IntToDecimal(strkEarn), AftermarketTokenID: null.IntFrom(1), - AftermarketEarnings: dbtypes.NullIntToDecimal(adEarn), + AftermarketEarnings: dbtypes.IntToDecimal(adEarn), SyntheticTokenID: null.IntFrom(1), - SyntheticEarnings: dbtypes.NullIntToDecimal(synthEarn), + SyntheticEarnings: dbtypes.IntToDecimal(synthEarn), ReceivedByAddress: null.BytesFrom(beneficiary.Bytes()), EarnedAt: currTime, }, @@ -302,11 +303,11 @@ func (r *RewardsQueryTestSuite) Test_Query_GetEarningsByVehicle_FwdPaginate_Firs IssuanceWeek: 4, VehicleID: 1, ConnectionStreak: null.IntFrom(14), - StreakEarnings: dbtypes.NullIntToDecimal(strkEarn), + StreakEarnings: dbtypes.IntToDecimal(strkEarn), AftermarketTokenID: null.IntFrom(1), - AftermarketEarnings: dbtypes.NullIntToDecimal(adEarn), + AftermarketEarnings: dbtypes.IntToDecimal(adEarn), SyntheticTokenID: null.IntFrom(1), - SyntheticEarnings: dbtypes.NullIntToDecimal(synthEarn), + SyntheticEarnings: dbtypes.IntToDecimal(synthEarn), ReceivedByAddress: null.BytesFrom(beneficiary.Bytes()), EarnedAt: currTime, }, @@ -483,11 +484,11 @@ func (r *RewardsQueryTestSuite) Test_Query_GetEarningsByVehicle_BackPaginate_Las IssuanceWeek: 2, VehicleID: 1, ConnectionStreak: null.IntFrom(12), - StreakEarnings: dbtypes.NullIntToDecimal(strkEarn), + StreakEarnings: dbtypes.IntToDecimal(strkEarn), AftermarketTokenID: null.IntFrom(1), - AftermarketEarnings: dbtypes.NullIntToDecimal(adEarn), + AftermarketEarnings: dbtypes.IntToDecimal(adEarn), SyntheticTokenID: null.IntFrom(1), - SyntheticEarnings: dbtypes.NullIntToDecimal(synthEarn), + SyntheticEarnings: dbtypes.IntToDecimal(synthEarn), ReceivedByAddress: null.BytesFrom(beneficiary.Bytes()), EarnedAt: currTime, }, @@ -495,11 +496,11 @@ func (r *RewardsQueryTestSuite) Test_Query_GetEarningsByVehicle_BackPaginate_Las IssuanceWeek: 3, VehicleID: 1, ConnectionStreak: null.IntFrom(13), - StreakEarnings: dbtypes.NullIntToDecimal(strkEarn), + StreakEarnings: dbtypes.IntToDecimal(strkEarn), AftermarketTokenID: null.IntFrom(1), - AftermarketEarnings: dbtypes.NullIntToDecimal(adEarn), + AftermarketEarnings: dbtypes.IntToDecimal(adEarn), SyntheticTokenID: null.IntFrom(1), - SyntheticEarnings: dbtypes.NullIntToDecimal(synthEarn), + SyntheticEarnings: dbtypes.IntToDecimal(synthEarn), ReceivedByAddress: null.BytesFrom(beneficiary.Bytes()), EarnedAt: currTime, }, @@ -507,11 +508,11 @@ func (r *RewardsQueryTestSuite) Test_Query_GetEarningsByVehicle_BackPaginate_Las IssuanceWeek: 4, VehicleID: 1, ConnectionStreak: null.IntFrom(14), - StreakEarnings: dbtypes.NullIntToDecimal(strkEarn), + StreakEarnings: dbtypes.IntToDecimal(strkEarn), AftermarketTokenID: null.IntFrom(1), - AftermarketEarnings: dbtypes.NullIntToDecimal(adEarn), + AftermarketEarnings: dbtypes.IntToDecimal(adEarn), SyntheticTokenID: null.IntFrom(1), - SyntheticEarnings: dbtypes.NullIntToDecimal(synthEarn), + SyntheticEarnings: dbtypes.IntToDecimal(synthEarn), ReceivedByAddress: null.BytesFrom(beneficiary.Bytes()), EarnedAt: currTime, }, @@ -688,11 +689,11 @@ func (r *RewardsQueryTestSuite) Test_Query_GetEarningsByVehicle_BackPaginate_Las IssuanceWeek: 2, VehicleID: 1, ConnectionStreak: null.IntFrom(12), - StreakEarnings: dbtypes.NullIntToDecimal(strkEarn), + StreakEarnings: dbtypes.IntToDecimal(strkEarn), AftermarketTokenID: null.IntFrom(1), - AftermarketEarnings: dbtypes.NullIntToDecimal(adEarn), + AftermarketEarnings: dbtypes.IntToDecimal(adEarn), SyntheticTokenID: null.IntFrom(1), - SyntheticEarnings: dbtypes.NullIntToDecimal(synthEarn), + SyntheticEarnings: dbtypes.IntToDecimal(synthEarn), ReceivedByAddress: null.BytesFrom(beneficiary.Bytes()), EarnedAt: currTime, }, @@ -700,11 +701,11 @@ func (r *RewardsQueryTestSuite) Test_Query_GetEarningsByVehicle_BackPaginate_Las IssuanceWeek: 3, VehicleID: 1, ConnectionStreak: null.IntFrom(13), - StreakEarnings: dbtypes.NullIntToDecimal(strkEarn), + StreakEarnings: dbtypes.IntToDecimal(strkEarn), AftermarketTokenID: null.IntFrom(1), - AftermarketEarnings: dbtypes.NullIntToDecimal(adEarn), + AftermarketEarnings: dbtypes.IntToDecimal(adEarn), SyntheticTokenID: null.IntFrom(1), - SyntheticEarnings: dbtypes.NullIntToDecimal(synthEarn), + SyntheticEarnings: dbtypes.IntToDecimal(synthEarn), ReceivedByAddress: null.BytesFrom(beneficiary.Bytes()), EarnedAt: currTime, }, @@ -712,11 +713,11 @@ func (r *RewardsQueryTestSuite) Test_Query_GetEarningsByVehicle_BackPaginate_Las IssuanceWeek: 4, VehicleID: 1, ConnectionStreak: null.IntFrom(14), - StreakEarnings: dbtypes.NullIntToDecimal(strkEarn), + StreakEarnings: dbtypes.IntToDecimal(strkEarn), AftermarketTokenID: null.IntFrom(1), - AftermarketEarnings: dbtypes.NullIntToDecimal(adEarn), + AftermarketEarnings: dbtypes.IntToDecimal(adEarn), SyntheticTokenID: null.IntFrom(1), - SyntheticEarnings: dbtypes.NullIntToDecimal(synthEarn), + SyntheticEarnings: dbtypes.IntToDecimal(synthEarn), ReceivedByAddress: null.BytesFrom(beneficiary.Bytes()), EarnedAt: currTime, }, @@ -892,11 +893,11 @@ func (r *RewardsQueryTestSuite) Test_Query_GetAftermarketDeviceEarnings_FwdPagin IssuanceWeek: 2, VehicleID: 1, ConnectionStreak: null.IntFrom(20), - StreakEarnings: dbtypes.NullIntToDecimal(strkEarn), + StreakEarnings: dbtypes.IntToDecimal(strkEarn), AftermarketTokenID: null.IntFrom(1), - AftermarketEarnings: dbtypes.NullIntToDecimal(adEarn), + AftermarketEarnings: dbtypes.IntToDecimal(adEarn), SyntheticTokenID: null.IntFrom(1), - SyntheticEarnings: dbtypes.NullIntToDecimal(synthEarn), + SyntheticEarnings: dbtypes.IntToDecimal(synthEarn), ReceivedByAddress: null.BytesFrom(beneficiary.Bytes()), EarnedAt: currTime, } @@ -1013,11 +1014,11 @@ func (r *RewardsQueryTestSuite) Test_Query_GetUserRewards_FwdPaginate() { IssuanceWeek: 2, VehicleID: 1, ConnectionStreak: null.IntFrom(12), - StreakEarnings: dbtypes.NullIntToDecimal(strkEarn), + StreakEarnings: dbtypes.IntToDecimal(strkEarn), AftermarketTokenID: null.IntFrom(1), - AftermarketEarnings: dbtypes.NullIntToDecimal(adEarn), + AftermarketEarnings: dbtypes.IntToDecimal(adEarn), SyntheticTokenID: null.IntFrom(1), - SyntheticEarnings: dbtypes.NullIntToDecimal(synthEarn), + SyntheticEarnings: dbtypes.IntToDecimal(synthEarn), ReceivedByAddress: null.BytesFrom(beneficiary.Bytes()), EarnedAt: currTime, }, @@ -1025,11 +1026,11 @@ func (r *RewardsQueryTestSuite) Test_Query_GetUserRewards_FwdPaginate() { IssuanceWeek: 3, VehicleID: 1, ConnectionStreak: null.IntFrom(13), - StreakEarnings: dbtypes.NullIntToDecimal(strkEarn), + StreakEarnings: dbtypes.IntToDecimal(strkEarn), AftermarketTokenID: null.IntFrom(1), - AftermarketEarnings: dbtypes.NullIntToDecimal(adEarn), + AftermarketEarnings: dbtypes.IntToDecimal(adEarn), SyntheticTokenID: null.IntFrom(1), - SyntheticEarnings: dbtypes.NullIntToDecimal(synthEarn), + SyntheticEarnings: dbtypes.IntToDecimal(synthEarn), ReceivedByAddress: null.BytesFrom(beneficiary.Bytes()), EarnedAt: currTime, }, @@ -1037,11 +1038,11 @@ func (r *RewardsQueryTestSuite) Test_Query_GetUserRewards_FwdPaginate() { IssuanceWeek: 4, VehicleID: 1, ConnectionStreak: null.IntFrom(14), - StreakEarnings: dbtypes.NullIntToDecimal(strkEarn), + StreakEarnings: dbtypes.IntToDecimal(strkEarn), AftermarketTokenID: null.IntFrom(1), - AftermarketEarnings: dbtypes.NullIntToDecimal(adEarn), + AftermarketEarnings: dbtypes.IntToDecimal(adEarn), SyntheticTokenID: null.IntFrom(1), - SyntheticEarnings: dbtypes.NullIntToDecimal(synthEarn), + SyntheticEarnings: dbtypes.IntToDecimal(synthEarn), ReceivedByAddress: null.BytesFrom(beneficiary.Bytes()), EarnedAt: currTime, }, @@ -1186,11 +1187,11 @@ func (r *RewardsQueryTestSuite) Test_Query_GetUserRewards_BackPaginate_LastBefor IssuanceWeek: 2, VehicleID: 1, ConnectionStreak: null.IntFrom(12), - StreakEarnings: dbtypes.NullIntToDecimal(strkEarn), + StreakEarnings: dbtypes.IntToDecimal(strkEarn), AftermarketTokenID: null.IntFrom(1), - AftermarketEarnings: dbtypes.NullIntToDecimal(adEarn), + AftermarketEarnings: dbtypes.IntToDecimal(adEarn), SyntheticTokenID: null.IntFrom(1), - SyntheticEarnings: dbtypes.NullIntToDecimal(synthEarn), + SyntheticEarnings: dbtypes.IntToDecimal(synthEarn), ReceivedByAddress: null.BytesFrom(beneficiary.Bytes()), EarnedAt: currTime, }, @@ -1198,11 +1199,11 @@ func (r *RewardsQueryTestSuite) Test_Query_GetUserRewards_BackPaginate_LastBefor IssuanceWeek: 3, VehicleID: 1, ConnectionStreak: null.IntFrom(13), - StreakEarnings: dbtypes.NullIntToDecimal(strkEarn), + StreakEarnings: dbtypes.IntToDecimal(strkEarn), AftermarketTokenID: null.IntFrom(1), - AftermarketEarnings: dbtypes.NullIntToDecimal(adEarn), + AftermarketEarnings: dbtypes.IntToDecimal(adEarn), SyntheticTokenID: null.IntFrom(1), - SyntheticEarnings: dbtypes.NullIntToDecimal(synthEarn), + SyntheticEarnings: dbtypes.IntToDecimal(synthEarn), ReceivedByAddress: null.BytesFrom(beneficiary.Bytes()), EarnedAt: currTime, }, @@ -1210,11 +1211,11 @@ func (r *RewardsQueryTestSuite) Test_Query_GetUserRewards_BackPaginate_LastBefor IssuanceWeek: 4, VehicleID: 1, ConnectionStreak: null.IntFrom(14), - StreakEarnings: dbtypes.NullIntToDecimal(strkEarn), + StreakEarnings: dbtypes.IntToDecimal(strkEarn), AftermarketTokenID: null.IntFrom(1), - AftermarketEarnings: dbtypes.NullIntToDecimal(adEarn), + AftermarketEarnings: dbtypes.IntToDecimal(adEarn), SyntheticTokenID: null.IntFrom(1), - SyntheticEarnings: dbtypes.NullIntToDecimal(synthEarn), + SyntheticEarnings: dbtypes.IntToDecimal(synthEarn), ReceivedByAddress: null.BytesFrom(beneficiary.Bytes()), EarnedAt: currTime, }, @@ -1334,3 +1335,104 @@ func (r *RewardsQueryTestSuite) Test_Query_GetUserRewards_BackPaginate_LastBefor } `, beneficiary.Hex(), beneficiary.Hex()), string(b)) } + +func (r *RewardsQueryTestSuite) Test_Query_GetUserRewards_NullEarnings() { + currTime := time.Now().UTC().Truncate(time.Second) + _, beneficiary, err := test.GenerateWallet() + r.NoError(err) + + r.createDependencies() + + var rewards = []models.Reward{ + { + IssuanceWeek: 3, + VehicleID: 1, + ConnectionStreak: null.IntFrom(13), + StreakEarnings: dbtypes.IntToDecimal(big.NewInt(1)), + AftermarketTokenID: null.IntFrom(1), + AftermarketEarnings: dbtypes.IntToDecimal(big.NewInt(1)), + SyntheticTokenID: null.IntFrom(1), + SyntheticEarnings: types.Decimal{}, + ReceivedByAddress: null.BytesFrom(beneficiary.Bytes()), + EarnedAt: currTime, + }, + } + + for _, rwd := range rewards { + err = rwd.Insert(r.ctx, r.pdb.DBS().Writer, boil.Infer()) + r.NoError(err) + } + + query := fmt.Sprintf(`{ + rewards(user: "%s") { + totalTokens + history(last: 2) { + totalCount + edges { + node { + week + beneficiary + connectionStreak + streakTokens + aftermarketDevice { + id + } + aftermarketDeviceTokens + syntheticDevice { + tokenId + } + syntheticDeviceTokens + vehicle { + id + tokenId + } + } + } + } + } + }`, beneficiary.Hex()) + + c := client.New( + loader.Middleware( + r.pdb, + handler.NewDefaultServer(NewExecutableSchema(Config{Resolvers: r.resolver})), r.settings, + ), + ) + + var resp any + c.MustPost(query, &resp) + b, err := json.Marshal(resp) + r.NoError(err) + r.JSONEq(fmt.Sprintf(` + { + "rewards": { + "totalTokens": "2", + "history": { + "totalCount": 1, + "edges": [ + { + "node": { + "week": 3, + "beneficiary": "%s", + "connectionStreak": 13, + "streakTokens": "1", + "aftermarketDevice": { + "id": "AD_kQE=" + }, + "aftermarketDeviceTokens": "1", + "syntheticDevice": { + "tokenId": 1 + }, + "syntheticDeviceTokens": "0", + "vehicle": { + "id": "V_kQE=", + "tokenId": 1 + } + } + } + ] + } + } + } + `, beneficiary.Hex()), string(b)) +} diff --git a/graph/schema/reward.graphqls b/graph/schema/reward.graphqls index 99def66b..74549b10 100644 --- a/graph/schema/reward.graphqls +++ b/graph/schema/reward.graphqls @@ -12,11 +12,6 @@ extend type Query { ): UserRewards } -type Earnings { - earnedTokens: BigInt! - earningsTransfers(first: Int): EarningsConnection! -} - type Earning { """ Week reward was issued diff --git a/internal/repositories/reward/rewards.go b/internal/repositories/reward/rewards.go index 47755025..29de3e9a 100644 --- a/internal/repositories/reward/rewards.go +++ b/internal/repositories/reward/rewards.go @@ -3,13 +3,11 @@ package reward import ( "context" "fmt" - "math/big" gmodel "github.com/DIMO-Network/identity-api/graph/model" "github.com/DIMO-Network/identity-api/internal/helpers" "github.com/DIMO-Network/identity-api/internal/repositories/base" "github.com/DIMO-Network/identity-api/models" - "github.com/DIMO-Network/shared/dbtypes" "github.com/ethereum/go-ethereum/common" "github.com/volatiletech/null/v8" "github.com/volatiletech/sqlboiler/v4/queries/qm" @@ -27,26 +25,22 @@ type RewardsCursor struct { } type EarningsSummary struct { - TokenSum types.NullDecimal `boil:"token_sum"` - TotalCount int `boil:"total_count"` + TokenSum types.Decimal `boil:"token_sum"` + TotalCount int `boil:"total_count"` } var rewardsCursorColumns = "(" + models.RewardColumns.IssuanceWeek + ", " + models.RewardColumns.VehicleID + ")" func RewardToAPI(reward models.Reward) gmodel.Earning { - stEarn := dbtypes.NullDecimalToInt(reward.StreakEarnings) - adEarn := dbtypes.NullDecimalToInt(reward.AftermarketEarnings) - syEarn := dbtypes.NullDecimalToInt(reward.SyntheticEarnings) - return gmodel.Earning{ Week: reward.IssuanceWeek, Beneficiary: common.BytesToAddress(*reward.ReceivedByAddress.Ptr()), ConnectionStreak: reward.ConnectionStreak.Ptr(), - StreakTokens: stEarn, + StreakTokens: reward.StreakEarnings.Int(nil), AftermarketDeviceID: reward.AftermarketTokenID.Ptr(), - AftermarketDeviceTokens: adEarn, + AftermarketDeviceTokens: reward.AftermarketEarnings.Int(nil), SyntheticDeviceID: reward.SyntheticTokenID.Ptr(), - SyntheticDeviceTokens: syEarn, + SyntheticDeviceTokens: reward.SyntheticEarnings.Int(nil), SentAt: reward.EarnedAt, VehicleID: reward.VehicleID, } @@ -154,7 +148,7 @@ func (r *Repository) GetEarningsSummary(ctx context.Context, conditions []qm.Que queryMods := []qm.QueryMod{ qm.Select( fmt.Sprintf( - `sum(%s + %s + %s) as token_sum`, + "COALESCE(sum(%s + %s + %s), 0) as token_sum", models.RewardColumns.StreakEarnings, models.RewardColumns.AftermarketEarnings, models.RewardColumns.SyntheticEarnings, ), "count(*) as total_count", @@ -176,20 +170,12 @@ func (r *Repository) GetEarningsByVehicleID(ctx context.Context, tokenID int) (* return nil, err } - if summary.TokenSum.IsZero() { - return &gmodel.VehicleEarnings{ - TotalTokens: &big.Int{}, - History: &gmodel.EarningsConnection{}, - VehicleID: tokenID, - }, nil - } - earningsConn := &gmodel.EarningsConnection{ TotalCount: summary.TotalCount, } return &gmodel.VehicleEarnings{ - TotalTokens: dbtypes.NullDecimalToInt(summary.TokenSum), + TotalTokens: summary.TokenSum.Int(nil), History: earningsConn, VehicleID: tokenID, }, nil @@ -221,20 +207,12 @@ func (r *Repository) GetEarningsByAfterMarketDeviceID(ctx context.Context, token return nil, err } - if stats.TokenSum.IsZero() { - return &gmodel.AftermarketDeviceEarnings{ - TotalTokens: &big.Int{}, - History: &gmodel.EarningsConnection{}, - AftermarketDeviceID: tokenID, - }, nil - } - earningsConn := &gmodel.EarningsConnection{ TotalCount: stats.TotalCount, } return &gmodel.AftermarketDeviceEarnings{ - TotalTokens: dbtypes.NullDecimalToInt(stats.TokenSum), + TotalTokens: stats.TokenSum.Int(nil), History: earningsConn, AftermarketDeviceID: tokenID, }, nil @@ -267,19 +245,12 @@ func (r *Repository) GetEarningsByUserAddress(ctx context.Context, user common.A return nil, err } - if summary.TokenSum.IsZero() { - return &gmodel.UserRewards{ - TotalTokens: &big.Int{}, - History: &gmodel.EarningsConnection{}, - }, nil - } - earningsConn := &gmodel.EarningsConnection{ TotalCount: summary.TotalCount, } return &gmodel.UserRewards{ - TotalTokens: dbtypes.NullDecimalToInt(summary.TokenSum), + TotalTokens: summary.TokenSum.Int(nil), History: earningsConn, User: user, }, nil diff --git a/internal/repositories/reward/rewards_test.go b/internal/repositories/reward/rewards_test.go index 189b989f..d0818825 100644 --- a/internal/repositories/reward/rewards_test.go +++ b/internal/repositories/reward/rewards_test.go @@ -21,7 +21,6 @@ import ( "github.com/volatiletech/null/v8" "github.com/volatiletech/sqlboiler/v4/boil" "github.com/volatiletech/sqlboiler/v4/queries/qm" - "github.com/volatiletech/sqlboiler/v4/types" ) type RewardsRepoTestSuite struct { @@ -173,25 +172,25 @@ func (r *RewardsRepoTestSuite) Test_GetEarningsSummary_Success() { }, } - var aftEarn types.NullDecimal - var strkEarn types.NullDecimal - var syntEarn types.NullDecimal + var aftEarn *big.Int + var strkEarn *big.Int + var syntEarn *big.Int for _, rr := range rw { baseAmt, ok := new(big.Int).SetString("59147051345528509681", 10) r.NotZero(ok) - aftEarn = dbtypes.NullIntToDecimal(baseAmt.Add(baseAmt, big.NewInt(30))) - strkEarn = dbtypes.NullIntToDecimal(baseAmt.Add(baseAmt, big.NewInt(50))) - syntEarn = dbtypes.NullIntToDecimal(baseAmt.Add(baseAmt, big.NewInt(10))) + aftEarn = baseAmt.Add(baseAmt, big.NewInt(30)) + strkEarn = baseAmt.Add(baseAmt, big.NewInt(50)) + syntEarn = baseAmt.Add(baseAmt, big.NewInt(10)) - rr.AftermarketEarnings = aftEarn - rr.StreakEarnings = strkEarn - rr.SyntheticEarnings = syntEarn + rr.AftermarketEarnings = dbtypes.IntToDecimal(aftEarn) + rr.StreakEarnings = dbtypes.IntToDecimal(strkEarn) + rr.SyntheticEarnings = dbtypes.IntToDecimal(syntEarn) - totalEarned.Add(totalEarned, dbtypes.NullDecimalToInt(aftEarn)) - totalEarned.Add(totalEarned, dbtypes.NullDecimalToInt(strkEarn)) - totalEarned.Add(totalEarned, dbtypes.NullDecimalToInt(syntEarn)) + totalEarned.Add(totalEarned, aftEarn) + totalEarned.Add(totalEarned, strkEarn) + totalEarned.Add(totalEarned, syntEarn) err = rr.Insert(r.ctx, r.pdb.DBS().Writer, boil.Infer()) r.NoError(err) @@ -201,7 +200,7 @@ func (r *RewardsRepoTestSuite) Test_GetEarningsSummary_Success() { r.NoError(err) r.Equal(2, summary.TotalCount) - r.Equal(totalEarned, dbtypes.NullDecimalToInt(summary.TokenSum)) + r.Equal(totalEarned, summary.TokenSum.Int(nil)) } func (r *RewardsRepoTestSuite) Test_GetEarningsByVehicleID_Success() { @@ -235,25 +234,25 @@ func (r *RewardsRepoTestSuite) Test_GetEarningsByVehicleID_Success() { }, } - var aftEarn types.NullDecimal - var strkEarn types.NullDecimal - var syntEarn types.NullDecimal + var aftEarn *big.Int + var strkEarn *big.Int + var syntEarn *big.Int for _, rr := range rw { baseAmt, ok := new(big.Int).SetString("59147051345528509681", 10) r.NotZero(ok) - aftEarn = dbtypes.NullIntToDecimal(baseAmt.Add(baseAmt, big.NewInt(30))) - strkEarn = dbtypes.NullIntToDecimal(baseAmt.Add(baseAmt, big.NewInt(50))) - syntEarn = dbtypes.NullIntToDecimal(baseAmt.Add(baseAmt, big.NewInt(10))) + aftEarn = baseAmt.Add(baseAmt, big.NewInt(30)) + strkEarn = baseAmt.Add(baseAmt, big.NewInt(50)) + syntEarn = baseAmt.Add(baseAmt, big.NewInt(10)) - rr.AftermarketEarnings = aftEarn - rr.StreakEarnings = strkEarn - rr.SyntheticEarnings = syntEarn + rr.AftermarketEarnings = dbtypes.IntToDecimal(aftEarn) + rr.StreakEarnings = dbtypes.IntToDecimal(strkEarn) + rr.SyntheticEarnings = dbtypes.IntToDecimal(syntEarn) - totalEarned.Add(totalEarned, dbtypes.NullDecimalToInt(aftEarn)) - totalEarned.Add(totalEarned, dbtypes.NullDecimalToInt(strkEarn)) - totalEarned.Add(totalEarned, dbtypes.NullDecimalToInt(syntEarn)) + totalEarned.Add(totalEarned, aftEarn) + totalEarned.Add(totalEarned, strkEarn) + totalEarned.Add(totalEarned, syntEarn) err = rr.Insert(r.ctx, r.pdb.DBS().Writer, boil.Infer()) r.NoError(err) @@ -327,25 +326,25 @@ func (r *RewardsRepoTestSuite) Test_PaginateVehicleEarningsByID_FwdPagination_Fi }, } - var aftEarn types.NullDecimal - var strkEarn types.NullDecimal - var syntEarn types.NullDecimal + var aftEarn *big.Int + var strkEarn *big.Int + var syntEarn *big.Int for _, rr := range rw { baseAmt, ok := new(big.Int).SetString("59147051345528509681", 10) r.NotZero(ok) - aftEarn = dbtypes.NullIntToDecimal(baseAmt.Add(baseAmt, big.NewInt(30))) - strkEarn = dbtypes.NullIntToDecimal(baseAmt.Add(baseAmt, big.NewInt(50))) - syntEarn = dbtypes.NullIntToDecimal(baseAmt.Add(baseAmt, big.NewInt(10))) + aftEarn = baseAmt.Add(baseAmt, big.NewInt(30)) + strkEarn = baseAmt.Add(baseAmt, big.NewInt(50)) + syntEarn = baseAmt.Add(baseAmt, big.NewInt(10)) - rr.AftermarketEarnings = aftEarn - rr.StreakEarnings = strkEarn - rr.SyntheticEarnings = syntEarn + rr.AftermarketEarnings = dbtypes.IntToDecimal(aftEarn) + rr.StreakEarnings = dbtypes.IntToDecimal(strkEarn) + rr.SyntheticEarnings = dbtypes.IntToDecimal(syntEarn) - totalEarned.Add(totalEarned, dbtypes.NullDecimalToInt(aftEarn)) - totalEarned.Add(totalEarned, dbtypes.NullDecimalToInt(strkEarn)) - totalEarned.Add(totalEarned, dbtypes.NullDecimalToInt(syntEarn)) + totalEarned.Add(totalEarned, aftEarn) + totalEarned.Add(totalEarned, strkEarn) + totalEarned.Add(totalEarned, syntEarn) err = rr.Insert(r.ctx, r.pdb.DBS().Writer, boil.Infer()) r.NoError(err) @@ -378,11 +377,11 @@ func (r *RewardsRepoTestSuite) Test_PaginateVehicleEarningsByID_FwdPagination_Fi Week: 2, Beneficiary: common.BytesToAddress(beneficiary.Bytes()), ConnectionStreak: &connStrk, - StreakTokens: dbtypes.NullDecimalToInt(strkEarn), + StreakTokens: strkEarn, AftermarketDeviceID: &aftID, - AftermarketDeviceTokens: dbtypes.NullDecimalToInt(aftEarn), + AftermarketDeviceTokens: aftEarn, SyntheticDeviceID: &syntID, - SyntheticDeviceTokens: dbtypes.NullDecimalToInt(syntEarn), + SyntheticDeviceTokens: syntEarn, SentAt: currTime, VehicleID: 11, }, @@ -431,25 +430,25 @@ func (r *RewardsRepoTestSuite) Test_PaginateVehicleEarningsByID_FwdPagination_Fi }, } - var aftEarn types.NullDecimal - var strkEarn types.NullDecimal - var syntEarn types.NullDecimal + var aftEarn *big.Int + var strkEarn *big.Int + var syntEarn *big.Int for _, rr := range rw { baseAmt, ok := new(big.Int).SetString("59147051345528509681", 10) r.NotZero(ok) - aftEarn = dbtypes.NullIntToDecimal(baseAmt.Add(baseAmt, big.NewInt(30))) - strkEarn = dbtypes.NullIntToDecimal(baseAmt.Add(baseAmt, big.NewInt(50))) - syntEarn = dbtypes.NullIntToDecimal(baseAmt.Add(baseAmt, big.NewInt(10))) + aftEarn = baseAmt.Add(baseAmt, big.NewInt(30)) + strkEarn = baseAmt.Add(baseAmt, big.NewInt(50)) + syntEarn = baseAmt.Add(baseAmt, big.NewInt(10)) - rr.AftermarketEarnings = aftEarn - rr.StreakEarnings = strkEarn - rr.SyntheticEarnings = syntEarn + rr.AftermarketEarnings = dbtypes.IntToDecimal(aftEarn) + rr.StreakEarnings = dbtypes.IntToDecimal(strkEarn) + rr.SyntheticEarnings = dbtypes.IntToDecimal(syntEarn) - totalEarned.Add(totalEarned, dbtypes.NullDecimalToInt(aftEarn)) - totalEarned.Add(totalEarned, dbtypes.NullDecimalToInt(strkEarn)) - totalEarned.Add(totalEarned, dbtypes.NullDecimalToInt(syntEarn)) + totalEarned.Add(totalEarned, aftEarn) + totalEarned.Add(totalEarned, strkEarn) + totalEarned.Add(totalEarned, syntEarn) err = rr.Insert(r.ctx, r.pdb.DBS().Writer, boil.Infer()) r.NoError(err) @@ -485,11 +484,11 @@ func (r *RewardsRepoTestSuite) Test_PaginateVehicleEarningsByID_FwdPagination_Fi Week: 2, Beneficiary: common.BytesToAddress(beneficiary.Bytes()), ConnectionStreak: &connStrk[0], - StreakTokens: dbtypes.NullDecimalToInt(strkEarn), + StreakTokens: strkEarn, AftermarketDeviceID: &aftID, - AftermarketDeviceTokens: dbtypes.NullDecimalToInt(aftEarn), + AftermarketDeviceTokens: aftEarn, SyntheticDeviceID: &syntID, - SyntheticDeviceTokens: dbtypes.NullDecimalToInt(syntEarn), + SyntheticDeviceTokens: syntEarn, SentAt: currTime, VehicleID: 11, }, @@ -500,11 +499,11 @@ func (r *RewardsRepoTestSuite) Test_PaginateVehicleEarningsByID_FwdPagination_Fi Week: 1, Beneficiary: common.BytesToAddress(beneficiary.Bytes()), ConnectionStreak: &connStrk[1], - StreakTokens: dbtypes.NullDecimalToInt(strkEarn), + StreakTokens: strkEarn, AftermarketDeviceID: &aftID, - AftermarketDeviceTokens: dbtypes.NullDecimalToInt(aftEarn), + AftermarketDeviceTokens: aftEarn, SyntheticDeviceID: &syntID, - SyntheticDeviceTokens: dbtypes.NullDecimalToInt(syntEarn), + SyntheticDeviceTokens: syntEarn, SentAt: currTime, VehicleID: 11, }, @@ -553,25 +552,25 @@ func (r *RewardsRepoTestSuite) Test_PaginateVehicleEarningsByID_FwdPagination_Em }, } - var aftEarn types.NullDecimal - var strkEarn types.NullDecimal - var syntEarn types.NullDecimal + var aftEarn *big.Int + var strkEarn *big.Int + var syntEarn *big.Int for _, rr := range rw { baseAmt, ok := new(big.Int).SetString("59147051345528509681", 10) r.NotZero(ok) - aftEarn = dbtypes.NullIntToDecimal(baseAmt.Add(baseAmt, big.NewInt(30))) - strkEarn = dbtypes.NullIntToDecimal(baseAmt.Add(baseAmt, big.NewInt(50))) - syntEarn = dbtypes.NullIntToDecimal(baseAmt.Add(baseAmt, big.NewInt(10))) + aftEarn = baseAmt.Add(baseAmt, big.NewInt(30)) + strkEarn = baseAmt.Add(baseAmt, big.NewInt(50)) + syntEarn = baseAmt.Add(baseAmt, big.NewInt(10)) - rr.AftermarketEarnings = aftEarn - rr.StreakEarnings = strkEarn - rr.SyntheticEarnings = syntEarn + rr.AftermarketEarnings = dbtypes.IntToDecimal(aftEarn) + rr.StreakEarnings = dbtypes.IntToDecimal(strkEarn) + rr.SyntheticEarnings = dbtypes.IntToDecimal(syntEarn) - totalEarned.Add(totalEarned, dbtypes.NullDecimalToInt(aftEarn)) - totalEarned.Add(totalEarned, dbtypes.NullDecimalToInt(strkEarn)) - totalEarned.Add(totalEarned, dbtypes.NullDecimalToInt(syntEarn)) + totalEarned.Add(totalEarned, aftEarn) + totalEarned.Add(totalEarned, strkEarn) + totalEarned.Add(totalEarned, syntEarn) err = rr.Insert(r.ctx, r.pdb.DBS().Writer, boil.Infer()) r.NoError(err) @@ -627,25 +626,25 @@ func (r *RewardsRepoTestSuite) Test_PaginateVehicleEarningsByID_BackPagination_L }, } - var aftEarn types.NullDecimal - var strkEarn types.NullDecimal - var syntEarn types.NullDecimal + var aftEarn *big.Int + var strkEarn *big.Int + var syntEarn *big.Int for _, rr := range rw { baseAmt, ok := new(big.Int).SetString("59147051345528509681", 10) r.NotZero(ok) - aftEarn = dbtypes.NullIntToDecimal(baseAmt.Add(baseAmt, big.NewInt(30))) - strkEarn = dbtypes.NullIntToDecimal(baseAmt.Add(baseAmt, big.NewInt(50))) - syntEarn = dbtypes.NullIntToDecimal(baseAmt.Add(baseAmt, big.NewInt(10))) + aftEarn = baseAmt.Add(baseAmt, big.NewInt(30)) + strkEarn = baseAmt.Add(baseAmt, big.NewInt(50)) + syntEarn = baseAmt.Add(baseAmt, big.NewInt(10)) - rr.AftermarketEarnings = aftEarn - rr.StreakEarnings = strkEarn - rr.SyntheticEarnings = syntEarn + rr.AftermarketEarnings = dbtypes.IntToDecimal(aftEarn) + rr.StreakEarnings = dbtypes.IntToDecimal(strkEarn) + rr.SyntheticEarnings = dbtypes.IntToDecimal(syntEarn) - totalEarned.Add(totalEarned, dbtypes.NullDecimalToInt(aftEarn)) - totalEarned.Add(totalEarned, dbtypes.NullDecimalToInt(strkEarn)) - totalEarned.Add(totalEarned, dbtypes.NullDecimalToInt(syntEarn)) + totalEarned.Add(totalEarned, aftEarn) + totalEarned.Add(totalEarned, strkEarn) + totalEarned.Add(totalEarned, syntEarn) err = rr.Insert(r.ctx, r.pdb.DBS().Writer, boil.Infer()) r.NoError(err) @@ -680,11 +679,11 @@ func (r *RewardsRepoTestSuite) Test_PaginateVehicleEarningsByID_BackPagination_L Week: 1, Beneficiary: common.BytesToAddress(beneficiary.Bytes()), ConnectionStreak: &connStrk, - StreakTokens: dbtypes.NullDecimalToInt(strkEarn), + StreakTokens: strkEarn, AftermarketDeviceID: &aftID, - AftermarketDeviceTokens: dbtypes.NullDecimalToInt(aftEarn), + AftermarketDeviceTokens: aftEarn, SyntheticDeviceID: &syntID, - SyntheticDeviceTokens: dbtypes.NullDecimalToInt(syntEarn), + SyntheticDeviceTokens: syntEarn, SentAt: currTime, VehicleID: 11, }, @@ -733,25 +732,25 @@ func (r *RewardsRepoTestSuite) Test_PaginateVehicleEarningsByID_BackPagination_L }, } - var aftEarn types.NullDecimal - var strkEarn types.NullDecimal - var syntEarn types.NullDecimal + var aftEarn *big.Int + var strkEarn *big.Int + var syntEarn *big.Int for _, rr := range rw { baseAmt, ok := new(big.Int).SetString("59147051345528509681", 10) r.NotZero(ok) - aftEarn = dbtypes.NullIntToDecimal(baseAmt.Add(baseAmt, big.NewInt(30))) - strkEarn = dbtypes.NullIntToDecimal(baseAmt.Add(baseAmt, big.NewInt(50))) - syntEarn = dbtypes.NullIntToDecimal(baseAmt.Add(baseAmt, big.NewInt(10))) + aftEarn = baseAmt.Add(baseAmt, big.NewInt(30)) + strkEarn = baseAmt.Add(baseAmt, big.NewInt(50)) + syntEarn = baseAmt.Add(baseAmt, big.NewInt(10)) - rr.AftermarketEarnings = aftEarn - rr.StreakEarnings = strkEarn - rr.SyntheticEarnings = syntEarn + rr.AftermarketEarnings = dbtypes.IntToDecimal(aftEarn) + rr.StreakEarnings = dbtypes.IntToDecimal(strkEarn) + rr.SyntheticEarnings = dbtypes.IntToDecimal(syntEarn) - totalEarned.Add(totalEarned, dbtypes.NullDecimalToInt(aftEarn)) - totalEarned.Add(totalEarned, dbtypes.NullDecimalToInt(strkEarn)) - totalEarned.Add(totalEarned, dbtypes.NullDecimalToInt(syntEarn)) + totalEarned.Add(totalEarned, aftEarn) + totalEarned.Add(totalEarned, strkEarn) + totalEarned.Add(totalEarned, syntEarn) err = rr.Insert(r.ctx, r.pdb.DBS().Writer, boil.Infer()) r.NoError(err) @@ -789,11 +788,11 @@ func (r *RewardsRepoTestSuite) Test_PaginateVehicleEarningsByID_BackPagination_L Week: 3, Beneficiary: common.BytesToAddress(beneficiary.Bytes()), ConnectionStreak: &connStrk[1], - StreakTokens: dbtypes.NullDecimalToInt(strkEarn), + StreakTokens: strkEarn, AftermarketDeviceID: &aftID, - AftermarketDeviceTokens: dbtypes.NullDecimalToInt(aftEarn), + AftermarketDeviceTokens: aftEarn, SyntheticDeviceID: &syntID, - SyntheticDeviceTokens: dbtypes.NullDecimalToInt(syntEarn), + SyntheticDeviceTokens: syntEarn, SentAt: currTime, VehicleID: 11, }, @@ -804,11 +803,11 @@ func (r *RewardsRepoTestSuite) Test_PaginateVehicleEarningsByID_BackPagination_L Week: 2, Beneficiary: common.BytesToAddress(beneficiary.Bytes()), ConnectionStreak: &connStrk[0], - StreakTokens: dbtypes.NullDecimalToInt(strkEarn), + StreakTokens: strkEarn, AftermarketDeviceID: &aftID, - AftermarketDeviceTokens: dbtypes.NullDecimalToInt(aftEarn), + AftermarketDeviceTokens: aftEarn, SyntheticDeviceID: &syntID, - SyntheticDeviceTokens: dbtypes.NullDecimalToInt(syntEarn), + SyntheticDeviceTokens: syntEarn, SentAt: currTime, VehicleID: 11, }, @@ -857,25 +856,25 @@ func (r *RewardsRepoTestSuite) Test_PaginateVehicleEarningsByID_BackPagination_E }, } - var aftEarn types.NullDecimal - var strkEarn types.NullDecimal - var syntEarn types.NullDecimal + var aftEarn *big.Int + var strkEarn *big.Int + var syntEarn *big.Int for _, rr := range rw { baseAmt, ok := new(big.Int).SetString("59147051345528509681", 10) r.NotZero(ok) - aftEarn = dbtypes.NullIntToDecimal(baseAmt.Add(baseAmt, big.NewInt(30))) - strkEarn = dbtypes.NullIntToDecimal(baseAmt.Add(baseAmt, big.NewInt(50))) - syntEarn = dbtypes.NullIntToDecimal(baseAmt.Add(baseAmt, big.NewInt(10))) + aftEarn = baseAmt.Add(baseAmt, big.NewInt(30)) + strkEarn = baseAmt.Add(baseAmt, big.NewInt(50)) + syntEarn = baseAmt.Add(baseAmt, big.NewInt(10)) - rr.AftermarketEarnings = aftEarn - rr.StreakEarnings = strkEarn - rr.SyntheticEarnings = syntEarn + rr.AftermarketEarnings = dbtypes.IntToDecimal(aftEarn) + rr.StreakEarnings = dbtypes.IntToDecimal(strkEarn) + rr.SyntheticEarnings = dbtypes.IntToDecimal(syntEarn) - totalEarned.Add(totalEarned, dbtypes.NullDecimalToInt(aftEarn)) - totalEarned.Add(totalEarned, dbtypes.NullDecimalToInt(strkEarn)) - totalEarned.Add(totalEarned, dbtypes.NullDecimalToInt(syntEarn)) + totalEarned.Add(totalEarned, aftEarn) + totalEarned.Add(totalEarned, strkEarn) + totalEarned.Add(totalEarned, syntEarn) err = rr.Insert(r.ctx, r.pdb.DBS().Writer, boil.Infer()) r.NoError(err) @@ -954,25 +953,25 @@ func (r *RewardsRepoTestSuite) Test_GetEarningsByAfterMarketDevice_FwdPagination }) r.NoError(err) - var aftEarn types.NullDecimal - var strkEarn types.NullDecimal - var syntEarn types.NullDecimal + var aftEarn *big.Int + var strkEarn *big.Int + var syntEarn *big.Int for _, rr := range rw { baseAmt, ok := new(big.Int).SetString("59147051345528509681", 10) r.NotZero(ok) - aftEarn = dbtypes.NullIntToDecimal(baseAmt.Add(baseAmt, big.NewInt(30))) - strkEarn = dbtypes.NullIntToDecimal(baseAmt.Add(baseAmt, big.NewInt(50))) - syntEarn = dbtypes.NullIntToDecimal(baseAmt.Add(baseAmt, big.NewInt(10))) + aftEarn = baseAmt.Add(baseAmt, big.NewInt(30)) + strkEarn = baseAmt.Add(baseAmt, big.NewInt(50)) + syntEarn = baseAmt.Add(baseAmt, big.NewInt(10)) - rr.AftermarketEarnings = aftEarn - rr.StreakEarnings = strkEarn - rr.SyntheticEarnings = syntEarn + rr.AftermarketEarnings = dbtypes.IntToDecimal(aftEarn) + rr.StreakEarnings = dbtypes.IntToDecimal(strkEarn) + rr.SyntheticEarnings = dbtypes.IntToDecimal(syntEarn) - totalEarned.Add(totalEarned, dbtypes.NullDecimalToInt(aftEarn)) - totalEarned.Add(totalEarned, dbtypes.NullDecimalToInt(strkEarn)) - totalEarned.Add(totalEarned, dbtypes.NullDecimalToInt(syntEarn)) + totalEarned.Add(totalEarned, aftEarn) + totalEarned.Add(totalEarned, strkEarn) + totalEarned.Add(totalEarned, syntEarn) err = rr.Insert(r.ctx, r.pdb.DBS().Writer, boil.Infer()) r.NoError(err) @@ -1008,11 +1007,11 @@ func (r *RewardsRepoTestSuite) Test_GetEarningsByAfterMarketDevice_FwdPagination Week: 2, Beneficiary: common.BytesToAddress(beneficiary.Bytes()), ConnectionStreak: rw[1].ConnectionStreak.Ptr(), - StreakTokens: dbtypes.NullDecimalToInt(strkEarn), + StreakTokens: strkEarn, AftermarketDeviceID: &aftID, - AftermarketDeviceTokens: dbtypes.NullDecimalToInt(aftEarn), + AftermarketDeviceTokens: aftEarn, SyntheticDeviceID: &syntID, - SyntheticDeviceTokens: dbtypes.NullDecimalToInt(syntEarn), + SyntheticDeviceTokens: syntEarn, SentAt: currTime, VehicleID: 11, }, @@ -1023,11 +1022,11 @@ func (r *RewardsRepoTestSuite) Test_GetEarningsByAfterMarketDevice_FwdPagination Week: 1, Beneficiary: common.BytesToAddress(beneficiary.Bytes()), ConnectionStreak: rw[0].ConnectionStreak.Ptr(), - StreakTokens: dbtypes.NullDecimalToInt(strkEarn), + StreakTokens: strkEarn, AftermarketDeviceID: &aftID, - AftermarketDeviceTokens: dbtypes.NullDecimalToInt(aftEarn), + AftermarketDeviceTokens: aftEarn, SyntheticDeviceID: &syntID, - SyntheticDeviceTokens: dbtypes.NullDecimalToInt(syntEarn), + SyntheticDeviceTokens: syntEarn, SentAt: currTime, VehicleID: 11, }, @@ -1062,25 +1061,25 @@ func (r *RewardsRepoTestSuite) Test_GetEarningsByAfterMarketDevice_FwdPagination }) r.NoError(err) - var aftEarn types.NullDecimal - var strkEarn types.NullDecimal - var syntEarn types.NullDecimal + var aftEarn *big.Int + var strkEarn *big.Int + var syntEarn *big.Int for _, rr := range rw { baseAmt, ok := new(big.Int).SetString("59147051345528509681", 10) r.NotZero(ok) - aftEarn = dbtypes.NullIntToDecimal(baseAmt.Add(baseAmt, big.NewInt(30))) - strkEarn = dbtypes.NullIntToDecimal(baseAmt.Add(baseAmt, big.NewInt(50))) - syntEarn = dbtypes.NullIntToDecimal(baseAmt.Add(baseAmt, big.NewInt(10))) + aftEarn = baseAmt.Add(baseAmt, big.NewInt(30)) + strkEarn = baseAmt.Add(baseAmt, big.NewInt(50)) + syntEarn = baseAmt.Add(baseAmt, big.NewInt(10)) - rr.AftermarketEarnings = aftEarn - rr.StreakEarnings = strkEarn - rr.SyntheticEarnings = syntEarn + rr.AftermarketEarnings = dbtypes.IntToDecimal(aftEarn) + rr.StreakEarnings = dbtypes.IntToDecimal(strkEarn) + rr.SyntheticEarnings = dbtypes.IntToDecimal(syntEarn) - totalEarned.Add(totalEarned, dbtypes.NullDecimalToInt(aftEarn)) - totalEarned.Add(totalEarned, dbtypes.NullDecimalToInt(strkEarn)) - totalEarned.Add(totalEarned, dbtypes.NullDecimalToInt(syntEarn)) + totalEarned.Add(totalEarned, aftEarn) + totalEarned.Add(totalEarned, strkEarn) + totalEarned.Add(totalEarned, syntEarn) err = rr.Insert(r.ctx, r.pdb.DBS().Writer, boil.Infer()) r.NoError(err) @@ -1118,11 +1117,11 @@ func (r *RewardsRepoTestSuite) Test_GetEarningsByAfterMarketDevice_FwdPagination Week: 2, Beneficiary: common.BytesToAddress(beneficiary.Bytes()), ConnectionStreak: &connStrk[0], - StreakTokens: dbtypes.NullDecimalToInt(strkEarn), + StreakTokens: strkEarn, AftermarketDeviceID: &aftID, - AftermarketDeviceTokens: dbtypes.NullDecimalToInt(aftEarn), + AftermarketDeviceTokens: aftEarn, SyntheticDeviceID: &syntID, - SyntheticDeviceTokens: dbtypes.NullDecimalToInt(syntEarn), + SyntheticDeviceTokens: syntEarn, SentAt: currTime, VehicleID: 11, }, @@ -1133,11 +1132,11 @@ func (r *RewardsRepoTestSuite) Test_GetEarningsByAfterMarketDevice_FwdPagination Week: 1, Beneficiary: common.BytesToAddress(beneficiary.Bytes()), ConnectionStreak: &connStrk[1], - StreakTokens: dbtypes.NullDecimalToInt(strkEarn), + StreakTokens: strkEarn, AftermarketDeviceID: &aftID, - AftermarketDeviceTokens: dbtypes.NullDecimalToInt(aftEarn), + AftermarketDeviceTokens: aftEarn, SyntheticDeviceID: &syntID, - SyntheticDeviceTokens: dbtypes.NullDecimalToInt(syntEarn), + SyntheticDeviceTokens: syntEarn, SentAt: currTime, VehicleID: 11, }, @@ -1172,25 +1171,25 @@ func (r *RewardsRepoTestSuite) Test_GetEarningsByAfterMarketDevice_BackPaginatio }) r.NoError(err) - var aftEarn types.NullDecimal - var strkEarn types.NullDecimal - var syntEarn types.NullDecimal + var aftEarn *big.Int + var strkEarn *big.Int + var syntEarn *big.Int for _, rr := range rw { baseAmt, ok := new(big.Int).SetString("59147051345528509681", 10) r.NotZero(ok) - aftEarn = dbtypes.NullIntToDecimal(baseAmt.Add(baseAmt, big.NewInt(30))) - strkEarn = dbtypes.NullIntToDecimal(baseAmt.Add(baseAmt, big.NewInt(50))) - syntEarn = dbtypes.NullIntToDecimal(baseAmt.Add(baseAmt, big.NewInt(10))) + aftEarn = baseAmt.Add(baseAmt, big.NewInt(30)) + strkEarn = baseAmt.Add(baseAmt, big.NewInt(50)) + syntEarn = baseAmt.Add(baseAmt, big.NewInt(10)) - rr.AftermarketEarnings = aftEarn - rr.StreakEarnings = strkEarn - rr.SyntheticEarnings = syntEarn + rr.AftermarketEarnings = dbtypes.IntToDecimal(aftEarn) + rr.StreakEarnings = dbtypes.IntToDecimal(strkEarn) + rr.SyntheticEarnings = dbtypes.IntToDecimal(syntEarn) - totalEarned.Add(totalEarned, dbtypes.NullDecimalToInt(aftEarn)) - totalEarned.Add(totalEarned, dbtypes.NullDecimalToInt(strkEarn)) - totalEarned.Add(totalEarned, dbtypes.NullDecimalToInt(syntEarn)) + totalEarned.Add(totalEarned, aftEarn) + totalEarned.Add(totalEarned, strkEarn) + totalEarned.Add(totalEarned, syntEarn) err = rr.Insert(r.ctx, r.pdb.DBS().Writer, boil.Infer()) r.NoError(err) @@ -1226,11 +1225,11 @@ func (r *RewardsRepoTestSuite) Test_GetEarningsByAfterMarketDevice_BackPaginatio Week: 1, Beneficiary: common.BytesToAddress(beneficiary.Bytes()), ConnectionStreak: &connStrk, - StreakTokens: dbtypes.NullDecimalToInt(strkEarn), + StreakTokens: strkEarn, AftermarketDeviceID: &aftID, - AftermarketDeviceTokens: dbtypes.NullDecimalToInt(aftEarn), + AftermarketDeviceTokens: aftEarn, SyntheticDeviceID: &syntID, - SyntheticDeviceTokens: dbtypes.NullDecimalToInt(syntEarn), + SyntheticDeviceTokens: syntEarn, SentAt: currTime, VehicleID: 11, }, @@ -1265,25 +1264,25 @@ func (r *RewardsRepoTestSuite) Test_GetEarningsByAfterMarketDevice_BackPaginatio }) r.NoError(err) - var aftEarn types.NullDecimal - var strkEarn types.NullDecimal - var syntEarn types.NullDecimal + var aftEarn *big.Int + var strkEarn *big.Int + var syntEarn *big.Int for _, rr := range rw { baseAmt, ok := new(big.Int).SetString("59147051345528509681", 10) r.NotZero(ok) - aftEarn = dbtypes.NullIntToDecimal(baseAmt.Add(baseAmt, big.NewInt(30))) - strkEarn = dbtypes.NullIntToDecimal(baseAmt.Add(baseAmt, big.NewInt(50))) - syntEarn = dbtypes.NullIntToDecimal(baseAmt.Add(baseAmt, big.NewInt(10))) + aftEarn = baseAmt.Add(baseAmt, big.NewInt(30)) + strkEarn = baseAmt.Add(baseAmt, big.NewInt(50)) + syntEarn = baseAmt.Add(baseAmt, big.NewInt(10)) - rr.AftermarketEarnings = aftEarn - rr.StreakEarnings = strkEarn - rr.SyntheticEarnings = syntEarn + rr.AftermarketEarnings = dbtypes.IntToDecimal(aftEarn) + rr.StreakEarnings = dbtypes.IntToDecimal(strkEarn) + rr.SyntheticEarnings = dbtypes.IntToDecimal(syntEarn) - totalEarned.Add(totalEarned, dbtypes.NullDecimalToInt(aftEarn)) - totalEarned.Add(totalEarned, dbtypes.NullDecimalToInt(strkEarn)) - totalEarned.Add(totalEarned, dbtypes.NullDecimalToInt(syntEarn)) + totalEarned.Add(totalEarned, aftEarn) + totalEarned.Add(totalEarned, strkEarn) + totalEarned.Add(totalEarned, syntEarn) err = rr.Insert(r.ctx, r.pdb.DBS().Writer, boil.Infer()) r.NoError(err) @@ -1322,11 +1321,11 @@ func (r *RewardsRepoTestSuite) Test_GetEarningsByAfterMarketDevice_BackPaginatio Week: 3, Beneficiary: common.BytesToAddress(beneficiary.Bytes()), ConnectionStreak: &connStrk[1], - StreakTokens: dbtypes.NullDecimalToInt(strkEarn), + StreakTokens: strkEarn, AftermarketDeviceID: &aftID, - AftermarketDeviceTokens: dbtypes.NullDecimalToInt(aftEarn), + AftermarketDeviceTokens: aftEarn, SyntheticDeviceID: &syntID, - SyntheticDeviceTokens: dbtypes.NullDecimalToInt(syntEarn), + SyntheticDeviceTokens: syntEarn, SentAt: currTime, VehicleID: 11, }, @@ -1337,11 +1336,11 @@ func (r *RewardsRepoTestSuite) Test_GetEarningsByAfterMarketDevice_BackPaginatio Week: 2, Beneficiary: common.BytesToAddress(beneficiary.Bytes()), ConnectionStreak: &connStrk[0], - StreakTokens: dbtypes.NullDecimalToInt(strkEarn), + StreakTokens: strkEarn, AftermarketDeviceID: &aftID, - AftermarketDeviceTokens: dbtypes.NullDecimalToInt(aftEarn), + AftermarketDeviceTokens: aftEarn, SyntheticDeviceID: &syntID, - SyntheticDeviceTokens: dbtypes.NullDecimalToInt(syntEarn), + SyntheticDeviceTokens: syntEarn, SentAt: currTime, VehicleID: 11, }, @@ -1367,25 +1366,25 @@ func (r *RewardsRepoTestSuite) Test_GetEarningsByUserAddress_FwdPagination_First }) r.NoError(err) - var aftEarn types.NullDecimal - var strkEarn types.NullDecimal - var syntEarn types.NullDecimal + var aftEarn *big.Int + var strkEarn *big.Int + var syntEarn *big.Int for _, rr := range rw { baseAmt, ok := new(big.Int).SetString("59147051345528509681", 10) r.NotZero(ok) - aftEarn = dbtypes.NullIntToDecimal(baseAmt.Add(baseAmt, big.NewInt(30))) - strkEarn = dbtypes.NullIntToDecimal(baseAmt.Add(baseAmt, big.NewInt(50))) - syntEarn = dbtypes.NullIntToDecimal(baseAmt.Add(baseAmt, big.NewInt(10))) + aftEarn = baseAmt.Add(baseAmt, big.NewInt(30)) + strkEarn = baseAmt.Add(baseAmt, big.NewInt(50)) + syntEarn = baseAmt.Add(baseAmt, big.NewInt(10)) - rr.AftermarketEarnings = aftEarn - rr.StreakEarnings = strkEarn - rr.SyntheticEarnings = syntEarn + rr.AftermarketEarnings = dbtypes.IntToDecimal(aftEarn) + rr.StreakEarnings = dbtypes.IntToDecimal(strkEarn) + rr.SyntheticEarnings = dbtypes.IntToDecimal(syntEarn) - totalEarned.Add(totalEarned, dbtypes.NullDecimalToInt(aftEarn)) - totalEarned.Add(totalEarned, dbtypes.NullDecimalToInt(strkEarn)) - totalEarned.Add(totalEarned, dbtypes.NullDecimalToInt(syntEarn)) + totalEarned.Add(totalEarned, aftEarn) + totalEarned.Add(totalEarned, strkEarn) + totalEarned.Add(totalEarned, syntEarn) err = rr.Insert(r.ctx, r.pdb.DBS().Writer, boil.Infer()) r.NoError(err) @@ -1421,11 +1420,11 @@ func (r *RewardsRepoTestSuite) Test_GetEarningsByUserAddress_FwdPagination_First Week: 2, Beneficiary: common.BytesToAddress(beneficiary.Bytes()), ConnectionStreak: rw[1].ConnectionStreak.Ptr(), - StreakTokens: dbtypes.NullDecimalToInt(strkEarn), + StreakTokens: strkEarn, AftermarketDeviceID: &aftID, - AftermarketDeviceTokens: dbtypes.NullDecimalToInt(aftEarn), + AftermarketDeviceTokens: aftEarn, SyntheticDeviceID: &syntID, - SyntheticDeviceTokens: dbtypes.NullDecimalToInt(syntEarn), + SyntheticDeviceTokens: syntEarn, SentAt: currTime, VehicleID: 11, }, @@ -1436,11 +1435,11 @@ func (r *RewardsRepoTestSuite) Test_GetEarningsByUserAddress_FwdPagination_First Week: 1, Beneficiary: common.BytesToAddress(beneficiary.Bytes()), ConnectionStreak: rw[0].ConnectionStreak.Ptr(), - StreakTokens: dbtypes.NullDecimalToInt(strkEarn), + StreakTokens: strkEarn, AftermarketDeviceID: &aftID, - AftermarketDeviceTokens: dbtypes.NullDecimalToInt(aftEarn), + AftermarketDeviceTokens: aftEarn, SyntheticDeviceID: &syntID, - SyntheticDeviceTokens: dbtypes.NullDecimalToInt(syntEarn), + SyntheticDeviceTokens: syntEarn, SentAt: currTime, VehicleID: 11, }, @@ -1466,25 +1465,25 @@ func (r *RewardsRepoTestSuite) Test_GetEarningsByUserAddress_BackPagination_Last }) r.NoError(err) - var aftEarn types.NullDecimal - var strkEarn types.NullDecimal - var syntEarn types.NullDecimal + var aftEarn *big.Int + var strkEarn *big.Int + var syntEarn *big.Int for _, rr := range rw { baseAmt, ok := new(big.Int).SetString("59147051345528509681", 10) r.NotZero(ok) - aftEarn = dbtypes.NullIntToDecimal(baseAmt.Add(baseAmt, big.NewInt(30))) - strkEarn = dbtypes.NullIntToDecimal(baseAmt.Add(baseAmt, big.NewInt(50))) - syntEarn = dbtypes.NullIntToDecimal(baseAmt.Add(baseAmt, big.NewInt(10))) + aftEarn = baseAmt.Add(baseAmt, big.NewInt(30)) + strkEarn = baseAmt.Add(baseAmt, big.NewInt(50)) + syntEarn = baseAmt.Add(baseAmt, big.NewInt(10)) - rr.AftermarketEarnings = aftEarn - rr.StreakEarnings = strkEarn - rr.SyntheticEarnings = syntEarn + rr.AftermarketEarnings = dbtypes.IntToDecimal(aftEarn) + rr.StreakEarnings = dbtypes.IntToDecimal(strkEarn) + rr.SyntheticEarnings = dbtypes.IntToDecimal(syntEarn) - totalEarned.Add(totalEarned, dbtypes.NullDecimalToInt(aftEarn)) - totalEarned.Add(totalEarned, dbtypes.NullDecimalToInt(strkEarn)) - totalEarned.Add(totalEarned, dbtypes.NullDecimalToInt(syntEarn)) + totalEarned.Add(totalEarned, aftEarn) + totalEarned.Add(totalEarned, strkEarn) + totalEarned.Add(totalEarned, syntEarn) err = rr.Insert(r.ctx, r.pdb.DBS().Writer, boil.Infer()) r.NoError(err) @@ -1520,11 +1519,11 @@ func (r *RewardsRepoTestSuite) Test_GetEarningsByUserAddress_BackPagination_Last Week: 1, Beneficiary: common.BytesToAddress(beneficiary.Bytes()), ConnectionStreak: &connStrk, - StreakTokens: dbtypes.NullDecimalToInt(strkEarn), + StreakTokens: strkEarn, AftermarketDeviceID: &aftID, - AftermarketDeviceTokens: dbtypes.NullDecimalToInt(aftEarn), + AftermarketDeviceTokens: aftEarn, SyntheticDeviceID: &syntID, - SyntheticDeviceTokens: dbtypes.NullDecimalToInt(syntEarn), + SyntheticDeviceTokens: syntEarn, SentAt: currTime, VehicleID: 11, }, @@ -1563,25 +1562,25 @@ func (r *RewardsRepoTestSuite) Test_GetEarningsByUserAddress_MultipleVehicle_Fwd rw[1].VehicleID = 5 // one of the rewards should be for our new vehicle rw[1].IssuanceWeek = 1 // put new vehicle in same week as old vehicle - var aftEarn types.NullDecimal - var strkEarn types.NullDecimal - var syntEarn types.NullDecimal + var aftEarn *big.Int + var strkEarn *big.Int + var syntEarn *big.Int for _, rr := range rw { baseAmt, ok := new(big.Int).SetString("59147051345528509681", 10) r.NotZero(ok) - aftEarn = dbtypes.NullIntToDecimal(baseAmt.Add(baseAmt, big.NewInt(30))) - strkEarn = dbtypes.NullIntToDecimal(baseAmt.Add(baseAmt, big.NewInt(50))) - syntEarn = dbtypes.NullIntToDecimal(baseAmt.Add(baseAmt, big.NewInt(10))) + aftEarn = baseAmt.Add(baseAmt, big.NewInt(30)) + strkEarn = baseAmt.Add(baseAmt, big.NewInt(50)) + syntEarn = baseAmt.Add(baseAmt, big.NewInt(10)) - rr.AftermarketEarnings = aftEarn - rr.StreakEarnings = strkEarn - rr.SyntheticEarnings = syntEarn + rr.AftermarketEarnings = dbtypes.IntToDecimal(aftEarn) + rr.StreakEarnings = dbtypes.IntToDecimal(strkEarn) + rr.SyntheticEarnings = dbtypes.IntToDecimal(syntEarn) - totalEarned.Add(totalEarned, dbtypes.NullDecimalToInt(aftEarn)) - totalEarned.Add(totalEarned, dbtypes.NullDecimalToInt(strkEarn)) - totalEarned.Add(totalEarned, dbtypes.NullDecimalToInt(syntEarn)) + totalEarned.Add(totalEarned, aftEarn) + totalEarned.Add(totalEarned, strkEarn) + totalEarned.Add(totalEarned, syntEarn) err = rr.Insert(r.ctx, r.pdb.DBS().Writer, boil.Infer()) r.NoError(err) @@ -1618,11 +1617,11 @@ func (r *RewardsRepoTestSuite) Test_GetEarningsByUserAddress_MultipleVehicle_Fwd Week: 3, Beneficiary: common.BytesToAddress(beneficiary.Bytes()), ConnectionStreak: rw[2].ConnectionStreak.Ptr(), - StreakTokens: dbtypes.NullDecimalToInt(strkEarn), + StreakTokens: strkEarn, AftermarketDeviceID: &aftID, - AftermarketDeviceTokens: dbtypes.NullDecimalToInt(aftEarn), + AftermarketDeviceTokens: aftEarn, SyntheticDeviceID: &syntID, - SyntheticDeviceTokens: dbtypes.NullDecimalToInt(syntEarn), + SyntheticDeviceTokens: syntEarn, SentAt: currTime, VehicleID: 11, }, @@ -1633,11 +1632,11 @@ func (r *RewardsRepoTestSuite) Test_GetEarningsByUserAddress_MultipleVehicle_Fwd Week: 1, Beneficiary: common.BytesToAddress(beneficiary.Bytes()), ConnectionStreak: rw[0].ConnectionStreak.Ptr(), - StreakTokens: dbtypes.NullDecimalToInt(strkEarn), + StreakTokens: strkEarn, AftermarketDeviceID: &aftID, - AftermarketDeviceTokens: dbtypes.NullDecimalToInt(aftEarn), + AftermarketDeviceTokens: aftEarn, SyntheticDeviceID: &syntID, - SyntheticDeviceTokens: dbtypes.NullDecimalToInt(syntEarn), + SyntheticDeviceTokens: syntEarn, SentAt: currTime, VehicleID: 11, }, @@ -1648,11 +1647,11 @@ func (r *RewardsRepoTestSuite) Test_GetEarningsByUserAddress_MultipleVehicle_Fwd Week: 1, Beneficiary: common.BytesToAddress(beneficiary.Bytes()), ConnectionStreak: rw[1].ConnectionStreak.Ptr(), - StreakTokens: dbtypes.NullDecimalToInt(strkEarn), + StreakTokens: strkEarn, AftermarketDeviceID: &aftID, - AftermarketDeviceTokens: dbtypes.NullDecimalToInt(aftEarn), + AftermarketDeviceTokens: aftEarn, SyntheticDeviceID: &syntID, - SyntheticDeviceTokens: dbtypes.NullDecimalToInt(syntEarn), + SyntheticDeviceTokens: syntEarn, SentAt: currTime, VehicleID: 5, }, diff --git a/internal/services/contract_events_consumer_test.go b/internal/services/contract_events_consumer_test.go index de147ff0..fa66effe 100644 --- a/internal/services/contract_events_consumer_test.go +++ b/internal/services/contract_events_consumer_test.go @@ -26,31 +26,34 @@ import ( "github.com/volatiletech/sqlboiler/v4/types" ) -const migrationsDirRelPath = "../../migrations" -const aftermarketDeviceAddr = "0xcf9af64522162da85164a714c23a7705e6e466b3" -const syntheticDeviceAddr = "0x85226A67FF1b3Ec6cb033162f7df5038a6C3bAB2" -const rewardContractAddr = "0x375885164266d48C48abbbb439Be98864Ae62bBE" - -var mintedAt = time.Now() - -var cloudEvent = shared.CloudEvent[json.RawMessage]{ - ID: "2SiTVhP3WBhfQQnnnpeBdMR7BSY", - Source: "chain/80001", - SpecVersion: "1.0", - Subject: "0x4de1bcf2b7e851e31216fc07989caa902a604784", - Time: mintedAt, - Type: "zone.dimo.contract.event", -} +const ( + migrationsDirRelPath = "../../migrations" + aftermarketDeviceAddr = "0xcf9af64522162da85164a714c23a7705e6e466b3" + syntheticDeviceAddr = "0x85226A67FF1b3Ec6cb033162f7df5038a6C3bAB2" + rewardContractAddr = "0x375885164266d48C48abbbb439Be98864Ae62bBE" +) -var contractEventData = ContractEventData{ - ChainID: 80001, - Contract: common.HexToAddress("0x4de1bcf2b7e851e31216fc07989caa902a604784"), - TransactionHash: common.HexToHash("0x811a85e24d0129a2018c9a6668652db63d73bc6d1c76f21b07da2162c6bfea7d"), - EventSignature: common.HexToHash("0xd624fd4c3311e1803d230d97ce71fd60c4f658c30a31fbe08edcb211fd90f63f"), - Block: Block{ - Time: mintedAt, - }, -} +var ( + zeroDecimal = types.NewDecimal(decimal.New(0, 0)) + mintedAt = time.Now() + cloudEvent = shared.CloudEvent[json.RawMessage]{ + ID: "2SiTVhP3WBhfQQnnnpeBdMR7BSY", + Source: "chain/80001", + SpecVersion: "1.0", + Subject: "0x4de1bcf2b7e851e31216fc07989caa902a604784", + Time: mintedAt, + Type: "zone.dimo.contract.event", + } + contractEventData = ContractEventData{ + ChainID: 80001, + Contract: common.HexToAddress("0x4de1bcf2b7e851e31216fc07989caa902a604784"), + TransactionHash: common.HexToHash("0x811a85e24d0129a2018c9a6668652db63d73bc6d1c76f21b07da2162c6bfea7d"), + EventSignature: common.HexToHash("0xd624fd4c3311e1803d230d97ce71fd60c4f658c30a31fbe08edcb211fd90f63f"), + Block: Block{ + Time: mintedAt, + }, + } +) // prepareEvent turns ContractEventData (the block time, number, etc) and the event arguments (from, to, tokenId, etc) // into a shared.CloudEvent[json.RawMessage] like the processor expects. @@ -988,11 +991,11 @@ func Test_Handle_TokensTransferred_ForDevice_AftermarketDevice_Event(t *testing. ReceivedByAddress: null.BytesFrom(user.Bytes()), EarnedAt: mintedTime, AftermarketTokenID: null.IntFrom(afterMktID), - AftermarketEarnings: types.NewNullDecimal(decimal.New(amt.Int64(), 0)), + AftermarketEarnings: types.NewDecimal(decimal.New(amt.Int64(), 0)), ConnectionStreak: null.Int{}, SyntheticTokenID: null.Int{}, - SyntheticEarnings: types.NullDecimal{}, - StreakEarnings: types.NullDecimal{}, + SyntheticEarnings: zeroDecimal, + StreakEarnings: zeroDecimal, }) } } @@ -1064,11 +1067,11 @@ func Test_Handle_TokensTransferred_ForDevice_SyntheticDevice_Event(t *testing.T) ReceivedByAddress: null.BytesFrom(user.Bytes()), EarnedAt: mintedTime, AftermarketTokenID: null.Int{}, - AftermarketEarnings: types.NullDecimal{}, + AftermarketEarnings: zeroDecimal, ConnectionStreak: null.Int{}, - StreakEarnings: types.NullDecimal{}, + StreakEarnings: zeroDecimal, SyntheticTokenID: null.IntFrom(synthID), - SyntheticEarnings: types.NewNullDecimal(decimal.New(amt.Int64(), 0)), + SyntheticEarnings: types.NewDecimal(decimal.New(amt.Int64(), 0)), }) } } @@ -1159,11 +1162,11 @@ func Test_Handle_TokensTransferred_ForDevice_UpdateSynthetic_WhenAftermarketExis ReceivedByAddress: null.BytesFrom(user.Bytes()), EarnedAt: mintedTime, AftermarketTokenID: null.IntFrom(afterMktID), - AftermarketEarnings: types.NewNullDecimal(decimal.New(payloads[0].amount.Int64(), 0)), + AftermarketEarnings: types.NewDecimal(decimal.New(payloads[0].amount.Int64(), 0)), SyntheticTokenID: null.IntFrom(synthID), - SyntheticEarnings: types.NewNullDecimal(decimal.New(payloads[1].amount.Int64(), 0)), + SyntheticEarnings: types.NewDecimal(decimal.New(payloads[1].amount.Int64(), 0)), ConnectionStreak: null.Int{}, - StreakEarnings: types.NullDecimal{}, + StreakEarnings: zeroDecimal, }) } } @@ -1248,18 +1251,19 @@ func Test_Handle_TokensTransferred_ForDevice_UpdateAftermarket_WhenSyntheticExis assert.Len(t, reward, 1) if len(reward) > 0 { - assert.Equal(t, reward[0], &models.Reward{ + assert.Equal(t, &models.Reward{ IssuanceWeek: 1, VehicleID: int(vID.Int64()), ReceivedByAddress: null.BytesFrom(user.Bytes()), EarnedAt: mintedTime, AftermarketTokenID: null.IntFrom(afterMktID), - AftermarketEarnings: types.NewNullDecimal(decimal.New(payloads[1].amount.Int64(), 0)), + AftermarketEarnings: types.NewDecimal(decimal.New(payloads[1].amount.Int64(), 0)), SyntheticTokenID: null.IntFrom(synthID), - SyntheticEarnings: types.NewNullDecimal(decimal.New(payloads[0].amount.Int64(), 0)), + SyntheticEarnings: types.NewDecimal(decimal.New(payloads[0].amount.Int64(), 0)), ConnectionStreak: null.Int{}, - StreakEarnings: types.NullDecimal{}, - }) + StreakEarnings: zeroDecimal, + }, + reward[0]) } } @@ -1372,11 +1376,11 @@ func Test_Handle_TokensTransferredForConnectionStreak_Event(t *testing.T) { ReceivedByAddress: null.BytesFrom(user.Bytes()), EarnedAt: mintedTime, AftermarketTokenID: null.IntFrom(afterMktID), - AftermarketEarnings: types.NewNullDecimal(decimal.New(payloads[1].amount.Int64(), 0)), + AftermarketEarnings: types.NewDecimal(decimal.New(payloads[1].amount.Int64(), 0)), SyntheticTokenID: null.IntFrom(synthID), - SyntheticEarnings: types.NewNullDecimal(decimal.New(payloads[0].amount.Int64(), 0)), + SyntheticEarnings: types.NewDecimal(decimal.New(payloads[0].amount.Int64(), 0)), ConnectionStreak: null.IntFrom(int(payloads[2].connectionStreak.Int64())), - StreakEarnings: types.NewNullDecimal(decimal.New(payloads[2].amount.Int64(), 0)), + StreakEarnings: types.NewDecimal(decimal.New(payloads[2].amount.Int64(), 0)), }, reward[0]) } } diff --git a/internal/services/contracts_events_consumer.go b/internal/services/contracts_events_consumer.go index 1bff2b83..b99e87fe 100644 --- a/internal/services/contracts_events_consumer.go +++ b/internal/services/contracts_events_consumer.go @@ -11,13 +11,12 @@ import ( "github.com/DIMO-Network/identity-api/models" "github.com/DIMO-Network/shared" "github.com/DIMO-Network/shared/db" - "github.com/ericlagergren/decimal" + "github.com/DIMO-Network/shared/dbtypes" "github.com/ethereum/go-ethereum/common" "github.com/goccy/go-json" "github.com/rs/zerolog" "github.com/volatiletech/null/v8" "github.com/volatiletech/sqlboiler/v4/boil" - "github.com/volatiletech/sqlboiler/v4/types" ) type ContractsEventsConsumer struct { @@ -567,15 +566,14 @@ func (c *ContractsEventsConsumer) handleTokensTransferredForDevice(ctx context.C if common.HexToAddress(c.settings.AftermarketDeviceAddr) == args.DeviceNftProxy { reward.AftermarketTokenID = null.IntFrom(int(args.DeviceNode.Int64())) - reward.AftermarketEarnings = types.NewNullDecimal(new(decimal.Big).SetBigMantScale(args.Amount, 0)) - + reward.AftermarketEarnings = dbtypes.IntToDecimal(args.Amount) return reward.Upsert(ctx, c.dbs.DBS().Writer, true, []string{cols.IssuanceWeek, cols.VehicleID}, boil.Whitelist(cols.AftermarketEarnings, cols.AftermarketTokenID), boil.Infer()) } else if common.HexToAddress(c.settings.SyntheticDeviceAddr) == args.DeviceNftProxy { reward.SyntheticTokenID = null.IntFrom(int(args.DeviceNode.Int64())) - reward.SyntheticEarnings = types.NewNullDecimal(new(decimal.Big).SetBigMantScale(args.Amount, 0)) + reward.SyntheticEarnings = dbtypes.IntToDecimal(args.Amount) return reward.Upsert(ctx, c.dbs.DBS().Writer, true, []string{cols.IssuanceWeek, cols.VehicleID}, @@ -596,7 +594,7 @@ func (c *ContractsEventsConsumer) handleTokensTransferredForConnectionStreak(ctx IssuanceWeek: int(args.Week.Int64()), VehicleID: int(args.VehicleNodeID.Int64()), ConnectionStreak: null.IntFrom(int(args.ConnectionStreak.Int64())), - StreakEarnings: types.NewNullDecimal(new(decimal.Big).SetBigMantScale(args.Amount, 0)), + StreakEarnings: dbtypes.IntToDecimal(args.Amount), } cols := models.RewardColumns diff --git a/migrations/20240501124220_not_null_token_values.sql b/migrations/20240501124220_not_null_token_values.sql new file mode 100644 index 00000000..67347c90 --- /dev/null +++ b/migrations/20240501124220_not_null_token_values.sql @@ -0,0 +1,25 @@ +-- +goose Up +-- +goose StatementBegin +SELECT 'up SQL query'; + +ALTER TABLE rewards +ALTER COLUMN streak_earnings SET DEFAULT 0, +ALTER COLUMN streak_earnings SET NOT NULL, +ALTER COLUMN aftermarket_earnings SET DEFAULT 0, +ALTER COLUMN aftermarket_earnings SET NOT NULL, +ALTER COLUMN synthetic_earnings SET DEFAULT 0, +ALTER COLUMN synthetic_earnings SET NOT NULL; + +-- +goose StatementEnd + +-- +goose Down +-- +goose StatementBegin +SELECT 'down SQL query'; +ALTER TABLE rewards + ALTER COLUMN streak_earnings DROP DEFAULT, + ALTER COLUMN streak_earnings DROP NOT NULL, + ALTER COLUMN aftermarket_earnings DROP DEFAULT, + ALTER COLUMN aftermarket_earnings DROP NOT NULL, + ALTER COLUMN synthetic_earnings DROP DEFAULT, + ALTER COLUMN synthetic_earnings DROP NOT NULL; +-- +goose StatementEnd diff --git a/models/rewards.go b/models/rewards.go index ce512f10..d45eeae5 100644 --- a/models/rewards.go +++ b/models/rewards.go @@ -25,16 +25,16 @@ import ( // Reward is an object representing the database table. type Reward struct { - IssuanceWeek int `boil:"issuance_week" json:"issuance_week" toml:"issuance_week" yaml:"issuance_week"` - VehicleID int `boil:"vehicle_id" json:"vehicle_id" toml:"vehicle_id" yaml:"vehicle_id"` - ConnectionStreak null.Int `boil:"connection_streak" json:"connection_streak,omitempty" toml:"connection_streak" yaml:"connection_streak,omitempty"` - StreakEarnings types.NullDecimal `boil:"streak_earnings" json:"streak_earnings,omitempty" toml:"streak_earnings" yaml:"streak_earnings,omitempty"` - AftermarketTokenID null.Int `boil:"aftermarket_token_id" json:"aftermarket_token_id,omitempty" toml:"aftermarket_token_id" yaml:"aftermarket_token_id,omitempty"` - AftermarketEarnings types.NullDecimal `boil:"aftermarket_earnings" json:"aftermarket_earnings,omitempty" toml:"aftermarket_earnings" yaml:"aftermarket_earnings,omitempty"` - SyntheticTokenID null.Int `boil:"synthetic_token_id" json:"synthetic_token_id,omitempty" toml:"synthetic_token_id" yaml:"synthetic_token_id,omitempty"` - SyntheticEarnings types.NullDecimal `boil:"synthetic_earnings" json:"synthetic_earnings,omitempty" toml:"synthetic_earnings" yaml:"synthetic_earnings,omitempty"` - ReceivedByAddress null.Bytes `boil:"received_by_address" json:"received_by_address,omitempty" toml:"received_by_address" yaml:"received_by_address,omitempty"` - EarnedAt time.Time `boil:"earned_at" json:"earned_at" toml:"earned_at" yaml:"earned_at"` + IssuanceWeek int `boil:"issuance_week" json:"issuance_week" toml:"issuance_week" yaml:"issuance_week"` + VehicleID int `boil:"vehicle_id" json:"vehicle_id" toml:"vehicle_id" yaml:"vehicle_id"` + ConnectionStreak null.Int `boil:"connection_streak" json:"connection_streak,omitempty" toml:"connection_streak" yaml:"connection_streak,omitempty"` + StreakEarnings types.Decimal `boil:"streak_earnings" json:"streak_earnings" toml:"streak_earnings" yaml:"streak_earnings"` + AftermarketTokenID null.Int `boil:"aftermarket_token_id" json:"aftermarket_token_id,omitempty" toml:"aftermarket_token_id" yaml:"aftermarket_token_id,omitempty"` + AftermarketEarnings types.Decimal `boil:"aftermarket_earnings" json:"aftermarket_earnings" toml:"aftermarket_earnings" yaml:"aftermarket_earnings"` + SyntheticTokenID null.Int `boil:"synthetic_token_id" json:"synthetic_token_id,omitempty" toml:"synthetic_token_id" yaml:"synthetic_token_id,omitempty"` + SyntheticEarnings types.Decimal `boil:"synthetic_earnings" json:"synthetic_earnings" toml:"synthetic_earnings" yaml:"synthetic_earnings"` + ReceivedByAddress null.Bytes `boil:"received_by_address" json:"received_by_address,omitempty" toml:"received_by_address" yaml:"received_by_address,omitempty"` + EarnedAt time.Time `boil:"earned_at" json:"earned_at" toml:"earned_at" yaml:"earned_at"` R *rewardR `boil:"-" json:"-" toml:"-" yaml:"-"` L rewardL `boil:"-" json:"-" toml:"-" yaml:"-"` @@ -90,32 +90,27 @@ var RewardTableColumns = struct { // Generated where -type whereHelpertypes_NullDecimal struct{ field string } +type whereHelpertypes_Decimal struct{ field string } -func (w whereHelpertypes_NullDecimal) EQ(x types.NullDecimal) qm.QueryMod { - return qmhelper.WhereNullEQ(w.field, false, x) +func (w whereHelpertypes_Decimal) EQ(x types.Decimal) qm.QueryMod { + return qmhelper.Where(w.field, qmhelper.EQ, x) } -func (w whereHelpertypes_NullDecimal) NEQ(x types.NullDecimal) qm.QueryMod { - return qmhelper.WhereNullEQ(w.field, true, x) +func (w whereHelpertypes_Decimal) NEQ(x types.Decimal) qm.QueryMod { + return qmhelper.Where(w.field, qmhelper.NEQ, x) } -func (w whereHelpertypes_NullDecimal) LT(x types.NullDecimal) qm.QueryMod { +func (w whereHelpertypes_Decimal) LT(x types.Decimal) qm.QueryMod { return qmhelper.Where(w.field, qmhelper.LT, x) } -func (w whereHelpertypes_NullDecimal) LTE(x types.NullDecimal) qm.QueryMod { +func (w whereHelpertypes_Decimal) LTE(x types.Decimal) qm.QueryMod { return qmhelper.Where(w.field, qmhelper.LTE, x) } -func (w whereHelpertypes_NullDecimal) GT(x types.NullDecimal) qm.QueryMod { +func (w whereHelpertypes_Decimal) GT(x types.Decimal) qm.QueryMod { return qmhelper.Where(w.field, qmhelper.GT, x) } -func (w whereHelpertypes_NullDecimal) GTE(x types.NullDecimal) qm.QueryMod { +func (w whereHelpertypes_Decimal) GTE(x types.Decimal) qm.QueryMod { return qmhelper.Where(w.field, qmhelper.GTE, x) } -func (w whereHelpertypes_NullDecimal) IsNull() qm.QueryMod { return qmhelper.WhereIsNull(w.field) } -func (w whereHelpertypes_NullDecimal) IsNotNull() qm.QueryMod { - return qmhelper.WhereIsNotNull(w.field) -} - type whereHelpernull_Bytes struct{ field string } func (w whereHelpernull_Bytes) EQ(x null.Bytes) qm.QueryMod { @@ -144,22 +139,22 @@ var RewardWhere = struct { IssuanceWeek whereHelperint VehicleID whereHelperint ConnectionStreak whereHelpernull_Int - StreakEarnings whereHelpertypes_NullDecimal + StreakEarnings whereHelpertypes_Decimal AftermarketTokenID whereHelpernull_Int - AftermarketEarnings whereHelpertypes_NullDecimal + AftermarketEarnings whereHelpertypes_Decimal SyntheticTokenID whereHelpernull_Int - SyntheticEarnings whereHelpertypes_NullDecimal + SyntheticEarnings whereHelpertypes_Decimal ReceivedByAddress whereHelpernull_Bytes EarnedAt whereHelpertime_Time }{ IssuanceWeek: whereHelperint{field: "\"identity_api\".\"rewards\".\"issuance_week\""}, VehicleID: whereHelperint{field: "\"identity_api\".\"rewards\".\"vehicle_id\""}, ConnectionStreak: whereHelpernull_Int{field: "\"identity_api\".\"rewards\".\"connection_streak\""}, - StreakEarnings: whereHelpertypes_NullDecimal{field: "\"identity_api\".\"rewards\".\"streak_earnings\""}, + StreakEarnings: whereHelpertypes_Decimal{field: "\"identity_api\".\"rewards\".\"streak_earnings\""}, AftermarketTokenID: whereHelpernull_Int{field: "\"identity_api\".\"rewards\".\"aftermarket_token_id\""}, - AftermarketEarnings: whereHelpertypes_NullDecimal{field: "\"identity_api\".\"rewards\".\"aftermarket_earnings\""}, + AftermarketEarnings: whereHelpertypes_Decimal{field: "\"identity_api\".\"rewards\".\"aftermarket_earnings\""}, SyntheticTokenID: whereHelpernull_Int{field: "\"identity_api\".\"rewards\".\"synthetic_token_id\""}, - SyntheticEarnings: whereHelpertypes_NullDecimal{field: "\"identity_api\".\"rewards\".\"synthetic_earnings\""}, + SyntheticEarnings: whereHelpertypes_Decimal{field: "\"identity_api\".\"rewards\".\"synthetic_earnings\""}, ReceivedByAddress: whereHelpernull_Bytes{field: "\"identity_api\".\"rewards\".\"received_by_address\""}, EarnedAt: whereHelpertime_Time{field: "\"identity_api\".\"rewards\".\"earned_at\""}, }