Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Regenerate OpenAPI's client code #1222

Closed
wants to merge 2 commits into from
Closed

Regenerate OpenAPI's client code #1222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9141935
Regenerate OpenAPI's client code
tomerb Jun 5, 2024
6e6b56c
Actually rename usage
tomerb Jun 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 51 additions & 38 deletions frontend/src/client/services.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@ import { request as __request } from './core/request';

import type { Body_login_login_access_token,Message,NewPassword,Token,UserPublic,UpdatePassword,UserCreate,UserRegister,UsersPublic,UserUpdate,UserUpdateMe,ItemCreate,ItemPublic,ItemsPublic,ItemUpdate } from './models';

export type TDataLoginAccessToken = {
export type TDataLoginLoginAccessToken = {
formData: Body_login_login_access_token

}
export type TDataRecoverPassword = {
export type TDataLoginRecoverPassword = {
email: string

}
export type TDataResetPassword = {
export type TDataLoginResetPassword = {
requestBody: NewPassword

}
export type TDataRecoverPasswordHtmlContent = {
export type TDataLoginRecoverPasswordHtmlContent = {
email: string

}
Expand All @@ -29,7 +29,7 @@ export class LoginService {
* @returns Token Successful Response
* @throws ApiError
*/
public static loginAccessToken(data: TDataLoginAccessToken): CancelablePromise<Token> {
public static loginLoginAccessToken(data: TDataLoginLoginAccessToken): CancelablePromise<Token> {
const {
formData,
} = data;
Expand All @@ -50,7 +50,7 @@ formData,
* @returns UserPublic Successful Response
* @throws ApiError
*/
public static testToken(): CancelablePromise<UserPublic> {
public static loginTestToken(): CancelablePromise<UserPublic> {
return __request(OpenAPI, {
method: 'POST',
url: '/api/v1/login/test-token',
Expand All @@ -63,7 +63,7 @@ formData,
* @returns Message Successful Response
* @throws ApiError
*/
public static recoverPassword(data: TDataRecoverPassword): CancelablePromise<Message> {
public static loginRecoverPassword(data: TDataLoginRecoverPassword): CancelablePromise<Message> {
const {
email,
} = data;
Expand All @@ -85,7 +85,7 @@ email,
* @returns Message Successful Response
* @throws ApiError
*/
public static resetPassword(data: TDataResetPassword): CancelablePromise<Message> {
public static loginResetPassword(data: TDataLoginResetPassword): CancelablePromise<Message> {
const {
requestBody,
} = data;
Expand All @@ -106,7 +106,7 @@ requestBody,
* @returns string Successful Response
* @throws ApiError
*/
public static recoverPasswordHtmlContent(data: TDataRecoverPasswordHtmlContent): CancelablePromise<string> {
public static loginRecoverPasswordHtmlContent(data: TDataLoginRecoverPasswordHtmlContent): CancelablePromise<string> {
const {
email,
} = data;
Expand All @@ -124,37 +124,37 @@ email,

}

export type TDataReadUsers = {
export type TDataUsersReadUsers = {
limit?: number
skip?: number

}
export type TDataCreateUser = {
export type TDataUsersCreateUser = {
requestBody: UserCreate

}
export type TDataUpdateUserMe = {
export type TDataUsersUpdateUserMe = {
requestBody: UserUpdateMe

}
export type TDataUpdatePasswordMe = {
export type TDataUsersUpdatePasswordMe = {
requestBody: UpdatePassword

}
export type TDataRegisterUser = {
export type TDataUsersRegisterUser = {
requestBody: UserRegister

}
export type TDataReadUserById = {
export type TDataUsersReadUserById = {
userId: number

}
export type TDataUpdateUser = {
export type TDataUsersUpdateUser = {
requestBody: UserUpdate
userId: number

}
export type TDataDeleteUser = {
export type TDataUsersDeleteUser = {
userId: number

}
Expand All @@ -167,7 +167,7 @@ export class UsersService {
* @returns UsersPublic Successful Response
* @throws ApiError
*/
public static readUsers(data: TDataReadUsers = {}): CancelablePromise<UsersPublic> {
public static usersReadUsers(data: TDataUsersReadUsers = {}): CancelablePromise<UsersPublic> {
const {
limit = 100,
skip = 0,
Expand All @@ -190,7 +190,7 @@ skip = 0,
* @returns UserPublic Successful Response
* @throws ApiError
*/
public static createUser(data: TDataCreateUser): CancelablePromise<UserPublic> {
public static usersCreateUser(data: TDataUsersCreateUser): CancelablePromise<UserPublic> {
const {
requestBody,
} = data;
Expand All @@ -211,20 +211,33 @@ requestBody,
* @returns UserPublic Successful Response
* @throws ApiError
*/
public static readUserMe(): CancelablePromise<UserPublic> {
public static usersReadUserMe(): CancelablePromise<UserPublic> {
return __request(OpenAPI, {
method: 'GET',
url: '/api/v1/users/me',
});
}

/**
* Delete User Me
* Delete own user.
* @returns Message Successful Response
* @throws ApiError
*/
public static usersDeleteUserMe(): CancelablePromise<Message> {
return __request(OpenAPI, {
method: 'DELETE',
url: '/api/v1/users/me',
});
}

/**
* Update User Me
* Update own user.
* @returns UserPublic Successful Response
* @throws ApiError
*/
public static updateUserMe(data: TDataUpdateUserMe): CancelablePromise<UserPublic> {
public static usersUpdateUserMe(data: TDataUsersUpdateUserMe): CancelablePromise<UserPublic> {
const {
requestBody,
} = data;
Expand All @@ -245,7 +258,7 @@ requestBody,
* @returns Message Successful Response
* @throws ApiError
*/
public static updatePasswordMe(data: TDataUpdatePasswordMe): CancelablePromise<Message> {
public static usersUpdatePasswordMe(data: TDataUsersUpdatePasswordMe): CancelablePromise<Message> {
const {
requestBody,
} = data;
Expand All @@ -266,7 +279,7 @@ requestBody,
* @returns UserPublic Successful Response
* @throws ApiError
*/
public static registerUser(data: TDataRegisterUser): CancelablePromise<UserPublic> {
public static usersRegisterUser(data: TDataUsersRegisterUser): CancelablePromise<UserPublic> {
const {
requestBody,
} = data;
Expand All @@ -287,7 +300,7 @@ requestBody,
* @returns UserPublic Successful Response
* @throws ApiError
*/
public static readUserById(data: TDataReadUserById): CancelablePromise<UserPublic> {
public static usersReadUserById(data: TDataUsersReadUserById): CancelablePromise<UserPublic> {
const {
userId,
} = data;
Expand All @@ -309,7 +322,7 @@ userId,
* @returns UserPublic Successful Response
* @throws ApiError
*/
public static updateUser(data: TDataUpdateUser): CancelablePromise<UserPublic> {
public static usersUpdateUser(data: TDataUsersUpdateUser): CancelablePromise<UserPublic> {
const {
requestBody,
userId,
Expand All @@ -334,7 +347,7 @@ userId,
* @returns Message Successful Response
* @throws ApiError
*/
public static deleteUser(data: TDataDeleteUser): CancelablePromise<Message> {
public static usersDeleteUser(data: TDataUsersDeleteUser): CancelablePromise<Message> {
const {
userId,
} = data;
Expand All @@ -352,7 +365,7 @@ userId,

}

export type TDataTestEmail = {
export type TDataUtilsTestEmail = {
emailTo: string

}
Expand All @@ -365,7 +378,7 @@ export class UtilsService {
* @returns Message Successful Response
* @throws ApiError
*/
public static testEmail(data: TDataTestEmail): CancelablePromise<Message> {
public static utilsTestEmail(data: TDataUtilsTestEmail): CancelablePromise<Message> {
const {
emailTo,
} = data;
Expand All @@ -383,25 +396,25 @@ emailTo,

}

export type TDataReadItems = {
export type TDataItemsReadItems = {
limit?: number
skip?: number

}
export type TDataCreateItem = {
export type TDataItemsCreateItem = {
requestBody: ItemCreate

}
export type TDataReadItem = {
export type TDataItemsReadItem = {
id: number

}
export type TDataUpdateItem = {
export type TDataItemsUpdateItem = {
id: number
requestBody: ItemUpdate

}
export type TDataDeleteItem = {
export type TDataItemsDeleteItem = {
id: number

}
Expand All @@ -414,7 +427,7 @@ export class ItemsService {
* @returns ItemsPublic Successful Response
* @throws ApiError
*/
public static readItems(data: TDataReadItems = {}): CancelablePromise<ItemsPublic> {
public static itemsReadItems(data: TDataItemsReadItems = {}): CancelablePromise<ItemsPublic> {
const {
limit = 100,
skip = 0,
Expand All @@ -437,7 +450,7 @@ skip = 0,
* @returns ItemPublic Successful Response
* @throws ApiError
*/
public static createItem(data: TDataCreateItem): CancelablePromise<ItemPublic> {
public static itemsCreateItem(data: TDataItemsCreateItem): CancelablePromise<ItemPublic> {
const {
requestBody,
} = data;
Expand All @@ -458,7 +471,7 @@ requestBody,
* @returns ItemPublic Successful Response
* @throws ApiError
*/
public static readItem(data: TDataReadItem): CancelablePromise<ItemPublic> {
public static itemsReadItem(data: TDataItemsReadItem): CancelablePromise<ItemPublic> {
const {
id,
} = data;
Expand All @@ -480,7 +493,7 @@ id,
* @returns ItemPublic Successful Response
* @throws ApiError
*/
public static updateItem(data: TDataUpdateItem): CancelablePromise<ItemPublic> {
public static itemsUpdateItem(data: TDataItemsUpdateItem): CancelablePromise<ItemPublic> {
const {
id,
requestBody,
Expand All @@ -505,7 +518,7 @@ requestBody,
* @returns Message Successful Response
* @throws ApiError
*/
public static deleteItem(data: TDataDeleteItem): CancelablePromise<Message> {
public static itemsDeleteItem(data: TDataItemsDeleteItem): CancelablePromise<Message> {
const {
id,
} = data;
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/Admin/AddUser.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ const AddUser = ({ isOpen, onClose }: AddUserProps) => {

const mutation = useMutation({
mutationFn: (data: UserCreate) =>
UsersService.createUser({ requestBody: data }),
UsersService.usersCreateUser({ requestBody: data }),
onSuccess: () => {
showToast("Success!", "User created successfully.", "success")
reset()
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/Admin/EditUser.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ const EditUser = ({ user, isOpen, onClose }: EditUserProps) => {

const mutation = useMutation({
mutationFn: (data: UserUpdateForm) =>
UsersService.updateUser({ userId: user.id, requestBody: data }),
UsersService.usersUpdateUser({ userId: user.id, requestBody: data }),
onSuccess: () => {
showToast("Success!", "User updated successfully.", "success")
onClose()
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/components/Common/DeleteAlert.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ const Delete = ({ type, id, isOpen, onClose }: DeleteProps) => {

const deleteEntity = async (id: number) => {
if (type === "Item") {
await ItemsService.deleteItem({ id: id })
await ItemsService.itemsDeleteItem({ id: id })
} else if (type === "User") {
await UsersService.deleteUser({ userId: id })
await UsersService.usersDeleteUser({ userId: id })
} else {
throw new Error(`Unexpected type: ${type}`)
}
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/Items/AddItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ const AddItem = ({ isOpen, onClose }: AddItemProps) => {

const mutation = useMutation({
mutationFn: (data: ItemCreate) =>
ItemsService.createItem({ requestBody: data }),
ItemsService.itemsCreateItem({ requestBody: data }),
onSuccess: () => {
showToast("Success!", "Item created successfully.", "success")
reset()
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/Items/EditItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ const EditItem = ({ item, isOpen, onClose }: EditItemProps) => {

const mutation = useMutation({
mutationFn: (data: ItemUpdate) =>
ItemsService.updateItem({ id: item.id, requestBody: data }),
ItemsService.itemsUpdateItem({ id: item.id, requestBody: data }),
onSuccess: () => {
showToast("Success!", "Item updated successfully.", "success")
onClose()
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/UserSettings/ChangePassword.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const ChangePassword = () => {

const mutation = useMutation({
mutationFn: (data: UpdatePassword) =>
UsersService.updatePasswordMe({ requestBody: data }),
UsersService.usersUpdatePasswordMe({ requestBody: data }),
onSuccess: () => {
showToast("Success!", "Password updated.", "success")
reset()
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/UserSettings/DeleteConfirmation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const DeleteConfirmation = ({ isOpen, onClose }: DeleteProps) => {
const { logout } = useAuth()

const mutation = useMutation({
mutationFn: (id: number) => UsersService.deleteUser({ userId: id }),
mutationFn: (id: number) => UsersService.usersDeleteUser({ userId: id }),
onSuccess: () => {
showToast(
"Success",
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/UserSettings/UserInformation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ const UserInformation = () => {

const mutation = useMutation({
mutationFn: (data: UserUpdateMe) =>
UsersService.updateUserMe({ requestBody: data }),
UsersService.usersUpdateUserMe({ requestBody: data }),
onSuccess: () => {
showToast("Success!", "User updated successfully.", "success")
},
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/hooks/useAuth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ const useAuth = () => {
const navigate = useNavigate()
const { data: user, isLoading } = useQuery<UserPublic | null, Error>({
queryKey: ["currentUser"],
queryFn: UsersService.readUserMe,
queryFn: UsersService.usersReadUserMe,
enabled: isLoggedIn(),
})

const login = async (data: AccessToken) => {
const response = await LoginService.loginAccessToken({
const response = await LoginService.loginLoginAccessToken({
formData: data,
})
localStorage.setItem("access_token", response.access_token)
Expand Down
Loading