diff --git a/datastores/mysql.go b/datastores/mysql.go index 79b6bd1..4691b1e 100644 --- a/datastores/mysql.go +++ b/datastores/mysql.go @@ -664,7 +664,7 @@ func (ds Mysql) FindAwol() ([]*proto.Awol, error) { Joins("INNER JOIN xf_nf_rosters_rank as ranks ON milpacs.rank_id = ranks.rank_id"). Joins("INNER JOIN xf_nf_rosters_position position ON milpacs.position_id = position.position_id"). Joins("INNER JOIN xf_nf_rosters_position_group pGroup ON position.position_group_id = pGroup.position_group_id"). - Where("milpacs.roster_id = ?", 1). + Where("milpacs.roster_id IN (?)", []int{1, 2}). Where("posts.date <= ?", cutoffTimestamp). Find(&awols) diff --git a/go.mod b/go.mod index a1b1a27..28db1b4 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.0 github.com/rakyll/statik v0.1.7 github.com/redis/go-redis/v9 v9.7.0 - github.com/spf13/cobra v1.8.1 + github.com/spf13/cobra v1.9.1 github.com/spf13/viper v1.19.0 golang.org/x/oauth2 v0.25.0 google.golang.org/genproto/googleapis/api v0.0.0-20250127172529-29210b9bc287 diff --git a/go.sum b/go.sum index 2551ef6..edcd62e 100644 --- a/go.sum +++ b/go.sum @@ -319,6 +319,8 @@ github.com/spf13/cast v1.7.1 h1:cuNEagBQEHWN1FnbGEjCXL2szYEXqfJPbP2HNUaca9Y= github.com/spf13/cast v1.7.1/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo= github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y= +github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo= +github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o= github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= diff --git a/proto/milpacs.pb.go b/proto/milpacs.pb.go index 37eda64..e62fc81 100644 --- a/proto/milpacs.pb.go +++ b/proto/milpacs.pb.go @@ -2540,7 +2540,7 @@ var file_milpacs_proto_rawDesc = string([]byte{ 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x24, 0x12, 0x22, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x31, 0x2f, 0x6d, 0x69, 0x6c, 0x70, 0x61, 0x63, 0x2f, 0x67, 0x61, 0x6d, 0x65, 0x72, 0x74, 0x61, 0x67, 0x2f, 0x7b, 0x67, 0x61, 0x6d, 0x65, 0x72, 0x74, 0x61, 0x67, 0x7d, 0x42, 0xc8, 0x01, 0x92, 0x41, 0xa9, - 0x01, 0x12, 0x07, 0x32, 0x05, 0x31, 0x2e, 0x37, 0x2e, 0x31, 0x2a, 0x01, 0x02, 0x5a, 0x59, 0x0a, + 0x01, 0x12, 0x07, 0x32, 0x05, 0x31, 0x2e, 0x37, 0x2e, 0x32, 0x2a, 0x01, 0x02, 0x5a, 0x59, 0x0a, 0x57, 0x0a, 0x06, 0x62, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x4d, 0x08, 0x02, 0x12, 0x38, 0x41, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x2c, 0x20, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x65, 0x64, 0x20, 0x62, 0x79, diff --git a/proto/milpacs.proto b/proto/milpacs.proto index 3206540..03e5fdb 100644 --- a/proto/milpacs.proto +++ b/proto/milpacs.proto @@ -29,7 +29,7 @@ import "google/protobuf/empty.proto"; // These annotations are used when generating the OpenAPI file. option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = { info: { - version: "1.7.1"; + version: "1.7.2"; }; external_docs: { url: "https://github.com/7cav/api"; diff --git a/servers/server.go b/servers/server.go index e50e2d4..1808b0d 100644 --- a/servers/server.go +++ b/servers/server.go @@ -37,7 +37,7 @@ import ( "os" ) -const version = "1.7.1" +const version = "1.7.2" type MicroServer struct { addr string diff --git a/third_party/OpenAPI/milpacs.swagger.json b/third_party/OpenAPI/milpacs.swagger.json index 368f67e..1f01e54 100644 --- a/third_party/OpenAPI/milpacs.swagger.json +++ b/third_party/OpenAPI/milpacs.swagger.json @@ -2,7 +2,7 @@ "swagger": "2.0", "info": { "title": "milpacs.proto", - "version": "1.7.1" + "version": "1.7.2" }, "tags": [ {