From 96fc2340681aa35e814a826877170736750dd785 Mon Sep 17 00:00:00 2001 From: Dennis Date: Tue, 14 May 2024 22:35:33 +0200 Subject: [PATCH] Adapts models --- internal/model/article.go | 12 ++++++------ internal/model/feed.go | 8 ++++---- internal/model/user.go | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/model/article.go b/internal/model/article.go index 8aad343..616d150 100644 --- a/internal/model/article.go +++ b/internal/model/article.go @@ -4,10 +4,10 @@ import "time" // TODO: Tag for article? type Article struct { - ID int64 - Name string - Url string - Read bool - ReadAt time.Time - FeedID *int64 + ID int64 `json:"id"` + Name string `json:"name"` + Url string `json:"url" validate:"required,url"` + Read bool `json:"read"` + ReadAt time.Time `json:"readAt"` + FeedID *int64 `json:"feedId"` } diff --git a/internal/model/feed.go b/internal/model/feed.go index 0932585..24ce52e 100644 --- a/internal/model/feed.go +++ b/internal/model/feed.go @@ -1,8 +1,8 @@ package model type Feed struct { - ID int64 - Name string - Url string - UserID int64 + ID int64 `json:"id"` + Name string `json:"name"` + Url string `json:"url" validate:"required,url"` + UserID int64 `json:"userId" validate:"required"` } diff --git a/internal/model/user.go b/internal/model/user.go index c264250..14d05c5 100644 --- a/internal/model/user.go +++ b/internal/model/user.go @@ -1,7 +1,7 @@ package model type User struct { - ID string - FirstName string - Email string + ID string `json:"id"` + FirstName string `json:"firstName" validate:"required"` + Email string `json:"email" validate:"required,email"` }