Skip to content

Commit 49ef5c3

Browse files
committed
fix vm test. fix a bit of swagger api docs
1 parent 2a028fc commit 49ef5c3

File tree

5 files changed

+19
-3
lines changed

5 files changed

+19
-3
lines changed

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ env_logger = "0"
2929
log = "0"
3030
rand = "0"
3131

32-
utoipa = { version = "3", features = ["actix_extras", "uuid"] }
32+
utoipa = { version = "3", features = ["actix_extras", "uuid", "chrono"] }
3333
utoipa-swagger-ui = { version = "3", features = ["actix-web"] }
3434
regex = "1"
3535
derive_more = "0"

src/routes/correlate.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ pub async fn update_all_transmission_locations(
177177
post,
178178
path = "/run/correlate_all",
179179
responses(
180-
(status = 200, description = "Correlation Successful", body = CorrelateAllResponse),
180+
(status = 200, description = "Correlation Successful", body = CorrelateResponse),
181181
(status = 401, description = "Unauthorized"),
182182
(status = 403, description = "Forbidden"),
183183
(status = 500, description = "Interal Error"),

src/routes/mod.rs

+10-1
Original file line numberDiff line numberDiff line change
@@ -156,11 +156,15 @@ pub struct DeactivateRequest {
156156
ListResponse<Organization>,
157157
ListResponse<TrekkieRun>,
158158
auth::LoginRequest,
159+
auth::UuidRequest,
160+
auth::UuidResponse,
161+
auth::ResponseLogin,
159162
user::RegisterUserRequest,
160163
user::ModifyUserRequest,
161164
user::CreateUserResponse,
162165
user::SetOfRoles,
163166
user::UserOption,
167+
user::MiniUser,
164168
region::RegionCreationResponse,
165169
region::CreateRegionRequest,
166170
region::EditRegionRequest,
@@ -170,16 +174,21 @@ pub struct DeactivateRequest {
170174
station::SearchStationRequest,
171175
station::ForceDeleteRequest,
172176
station::ApproveStationRequest,
177+
station::StationInfoResponse,
173178
trekkie::EditTrekkieRuns,
174179
trekkie::MiniGPS,
175180
trekkie::TrekkieRunInfo,
181+
trekkie::correlate::CorrelationRequest,
182+
trekkie::correlate::CorrelateResponse,
176183
organization::CreateOrganizationRequest,
177184
organization::UpdateOrganizationRequest,
178185
organization::ForceDeleteRequest,
179186
organization::OrganizationInfoResponse,
180187
correlate::CorrelatePlease,
181-
correlate::CorrelateAllRequest,
182188
correlate::CorrelateResponse,
189+
correlate::CorrelateAllRequest,
190+
correlate::UpdateAllRequest,
191+
correlate::UpdateAllLocationsResponse
183192
))
184193
)]
185194
pub struct ApiDoc;

tests/vm/datacare.nix

+2
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,6 @@
2525
bind = config.TLMS.datacare.redis.host;
2626
port = config.TLMS.datacare.redis.port;
2727
};
28+
29+
users.groups.datacare = {};
2830
}

tests/vm/postgres.nix

+5
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
services.postgresql = {
33
enable = true;
44
port = 5432;
5+
authentication = pkgs.lib.mkOverride 10 ''
6+
local all all trust
7+
host all all 127.0.0.1/32 trust
8+
host all all ::1/128 trust
9+
'';
510
package = pkgs.postgresql_14;
611
ensureDatabases = [ "tlms" ];
712
ensureUsers = [

0 commit comments

Comments
 (0)