Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
548a8eaa07
|
||
|
|
6d52867485
|
||
|
|
3ccc1a9a6d |
@@ -25,7 +25,7 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
echo "Creating version"
|
echo "Creating version"
|
||||||
|
|
||||||
VERSION="0.2.2"
|
VERSION="0.2.3"
|
||||||
PROJECT_COMMIT_HASH=$(git rev-parse HEAD | cut -c 1-10)
|
PROJECT_COMMIT_HASH=$(git rev-parse HEAD | cut -c 1-10)
|
||||||
BRANCH_REF="${{ gitea.ref }}"
|
BRANCH_REF="${{ gitea.ref }}"
|
||||||
BRANCH_NAME=$(echo "$BRANCH_REF" | cut -d '/' -f 3)
|
BRANCH_NAME=$(echo "$BRANCH_REF" | cut -d '/' -f 3)
|
||||||
|
|||||||
@@ -0,0 +1,13 @@
|
|||||||
|
package user
|
||||||
|
|
||||||
|
import (
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/google/uuid"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Organization struct {
|
||||||
|
Id uuid.UUID `json:"id"`
|
||||||
|
Name string `json:"name"`
|
||||||
|
Created *time.Time `json:"created,omitempty"`
|
||||||
|
}
|
||||||
@@ -7,13 +7,12 @@ import (
|
|||||||
"github.com/google/uuid"
|
"github.com/google/uuid"
|
||||||
)
|
)
|
||||||
|
|
||||||
// TODO: Replace Usr with all the fields from User, except Password and other sensitive fields
|
|
||||||
type UserProfile struct {
|
type UserProfile struct {
|
||||||
UserId uuid.UUID `json:"user_id"`
|
UserId uuid.UUID `json:"user_id"`
|
||||||
PhoneNumber string `json:"phone_number"`
|
PhoneNumber string `json:"phone_number"`
|
||||||
Username string `json:"username"`
|
Username string `json:"username"`
|
||||||
Firstname string `json:"firstname"`
|
Firstname *string `json:"firstname,omitempty"`
|
||||||
Lastname string `json:"lastname"`
|
Lastname *string `json:"lastname,omitempty"`
|
||||||
Created time.Time `json:"created"`
|
Created time.Time `json:"created"`
|
||||||
LastLogin *time.Time `json:"last_login,omitempty"`
|
LastLogin *time.Time `json:"last_login,omitempty"`
|
||||||
}
|
}
|
||||||
@@ -27,10 +26,10 @@ func InitUserProfile(usr *User) (usrProfile *UserProfile, err error) {
|
|||||||
usrProfile.PhoneNumber = usr.PhoneNumber
|
usrProfile.PhoneNumber = usr.PhoneNumber
|
||||||
usrProfile.Username = usr.Username
|
usrProfile.Username = usr.Username
|
||||||
if usr.Firstname != nil {
|
if usr.Firstname != nil {
|
||||||
usrProfile.Firstname = *usr.Firstname
|
usrProfile.Firstname = usr.Firstname
|
||||||
}
|
}
|
||||||
if usr.Lastname != nil {
|
if usr.Lastname != nil {
|
||||||
usrProfile.Lastname = *usr.Lastname
|
usrProfile.Lastname = usr.Lastname
|
||||||
}
|
}
|
||||||
usrProfile.Created = usr.Created
|
usrProfile.Created = usr.Created
|
||||||
if usr.LastLogin != nil {
|
if usr.LastLogin != nil {
|
||||||
|
|||||||
Reference in New Issue
Block a user