mirrors/homebox
1
0
Fork 1
mirror of https://github.com/hay-kot/homebox.git synced 2024-12-25 08:16:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix types

Browse source
This commit is contained in:
Hayden 2022-10-03 20:09:26 -08:00
parent 1143246816
commit a67316a889
7 changed files with 42 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
backend/app/api/docs/docs.go
View file

@ -42,7 +42,7 @@ const docTemplate = `{
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/v1.GroupTokenPayload"
"$ref": "#/definitions/v1.GroupInvitationCreate"
}
}
],
@ -50,7 +50,7 @@ const docTemplate = `{
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/v1.GroupTokenResponse"
"$ref": "#/definitions/v1.GroupInvitation"
}
}
}
@ -1582,26 +1582,26 @@ const docTemplate = `{
}
}
},
"v1.GroupTokenPayload": {
"v1.GroupInvitation": {
"type": "object",
"properties": {
"expiresAt": {
"type": "string"
},
"token": {
"type": "string"
},
"uses": {
"type": "integer"
}
}
},
"v1.GroupTokenResponse": {
"v1.GroupInvitationCreate": {
"type": "object",
"properties": {
"expiresAt": {
"type": "string"
},
"token": {
"type": "string"
},
"uses": {
"type": "integer"
}

14
backend/app/api/docs/swagger.json
View file

@ -34,7 +34,7 @@
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/v1.GroupTokenPayload"
"$ref": "#/definitions/v1.GroupInvitationCreate"
}
}
],
@ -42,7 +42,7 @@
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/v1.GroupTokenResponse"
"$ref": "#/definitions/v1.GroupInvitation"
}
}
}
@ -1574,26 +1574,26 @@
}
}
},
"v1.GroupTokenPayload": {
"v1.GroupInvitation": {
"type": "object",
"properties": {
"expiresAt": {
"type": "string"
},
"token": {
"type": "string"
},
"uses": {
"type": "integer"
}
}
},
"v1.GroupTokenResponse": {
"v1.GroupInvitationCreate": {
"type": "object",
"properties": {
"expiresAt": {
"type": "string"
},
"token": {
"type": "string"
},
"uses": {
"type": "integer"
}

20
backend/app/api/docs/swagger.yaml
View file

@ -355,14 +355,7 @@ definitions:
version:
type: string
type: object
v1.GroupTokenPayload:
properties:
expiresAt:
type: string
uses:
type: integer
type: object
v1.GroupTokenResponse:
v1.GroupInvitation:
properties:
expiresAt:
type: string
@ -371,6 +364,13 @@ definitions:
uses:
type: integer
type: object
v1.GroupInvitationCreate:
properties:
expiresAt:
type: string
uses:
type: integer
type: object
v1.ItemAttachmentToken:
properties:
token:
@ -402,14 +402,14 @@ paths:
name: payload
required: true
schema:
$ref: '#/definitions/v1.GroupTokenPayload'
$ref: '#/definitions/v1.GroupInvitationCreate'
produces:
- application/json
responses:
"200":
description: OK
schema:
$ref: '#/definitions/v1.GroupTokenResponse'
$ref: '#/definitions/v1.GroupInvitation'
security:
- Bearer: []
summary: Get the current user

14
backend/app/api/v1/v1_ctrl_group.go
View file

@ -10,12 +10,12 @@ import (
)
type (
GroupTokenPayload struct {
GroupInvitationCreate struct {
Uses int `json:"uses"`
ExpiresAt time.Time `json:"expiresAt"`
}
GroupTokenResponse struct {
GroupInvitation struct {
Token string `json:"token"`
ExpiresAt time.Time `json:"expiresAt"`
Uses int `json:"uses"`
@ -26,13 +26,13 @@ type (
// @Summary Get the current user
// @Tags User
// @Produce json
// @Param payload body GroupTokenPayload true "User Data"
// @Success 200 {object} GroupTokenResponse
// @Param payload body GroupInvitationCreate true "User Data"
// @Success 200 {object} GroupInvitation
// @Router /v1/groups/invitations [Post]
// @Security Bearer
func (ctrl *V1Controller) HandleGroupInvitationsCreate() http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
data := GroupTokenPayload{}
data := GroupInvitationCreate{}
if err := server.Decode(r, &data); err != nil {
log.Err(err).Msg("failed to decode user registration data")
@ -53,10 +53,10 @@ func (ctrl *V1Controller) HandleGroupInvitationsCreate() http.HandlerFunc {
return
}
server.Respond(w, http.StatusCreated, server.Wrap(GroupTokenResponse{
server.Respond(w, http.StatusCreated, GroupInvitation{
Token: token,
ExpiresAt: data.ExpiresAt,
Uses: data.Uses,
}))
})
}
}

12
frontend/lib/api/types/data-contracts.ts
View file

@ -239,14 +239,14 @@ export interface Build {
version: string;
}
export interface GroupTokenPayload {
expiresAt: string;
export interface GroupInvitation {
expiresAt: Date;
token: string;
uses: number;
}
export interface GroupTokenResponse {
expiresAt: string;
token: string;
export interface GroupInvitationCreate {
expiresAt: Date;
uses: number;
}
@ -255,6 +255,6 @@ export interface ItemAttachmentToken {
}
export interface TokenResponse {
expiresAt: string;
expiresAt: Date;
token: string;
}

4
frontend/lib/api/types/non-generated.ts
View file

@ -4,3 +4,7 @@ export enum AttachmentTypes {
Warranty = "warranty",
Attachment = "attachment",
}
export type Result<T> = {
item: T;
};

1
scripts/process-types.py
View file

@ -32,6 +32,7 @@ regex_replace: dict[re.Pattern, str] = {
"soldTime",
"purchaseTime",
"warrantyExpires",
"expiresAt",
),
}