Compare commits
28
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
446583d705
|
||
|
|
8544a69eb1
|
||
|
|
894e1387de
|
||
|
|
6f90428975
|
||
|
|
c3ec0731b2
|
||
|
|
413d9baffd
|
||
|
|
87a437311b
|
||
|
|
2820cdfed6
|
||
|
|
b230b7e0d9
|
||
|
|
897ac80b96
|
||
|
|
509b9d58a5
|
||
|
|
e459183747
|
||
|
|
19d074d3d7
|
||
|
|
209e1428d8
|
||
|
|
97591d99b5
|
||
|
|
587f9a05af
|
||
|
|
b130f6e069
|
||
|
|
e74dd82211
|
||
|
|
8cfccc2722
|
||
|
|
801a314421
|
||
|
|
9565259dc1
|
||
|
|
f05a513926
|
||
|
|
39ecf052a0
|
||
|
|
2b5cb3a093
|
||
|
|
c2cde15189
|
||
|
|
b8e8621e0d
|
||
|
|
0bf24d929c
|
||
|
|
dcbc2609c4
|
@@ -25,7 +25,7 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
echo "Creating version"
|
echo "Creating version"
|
||||||
|
|
||||||
VERSION="0.2.3"
|
VERSION="0.2.2"
|
||||||
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)
|
||||||
|
|||||||
@@ -1,13 +0,0 @@
|
|||||||
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"`
|
|
||||||
}
|
|
||||||
+8
-8
@@ -7,14 +7,14 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
type User struct {
|
type User struct {
|
||||||
Id uuid.UUID `json:"id"`
|
Id uuid.UUID `json:"id"`
|
||||||
PhoneNumber string `json:"phone_number"`
|
PhoneNumber string `json:"phone_number"`
|
||||||
Username string `json:"username"`
|
Username string `json:"username"`
|
||||||
Password string `json:"password"`
|
Password string `json:"password"`
|
||||||
// Firstname is a pointer
|
// Firstname is a pointer
|
||||||
Firstname *string `json:"first_name,omitempty"`
|
Firstname *string `json:"first_name,omitempty"`
|
||||||
// Lastname is a pointer
|
// Lastname is a pointer
|
||||||
Lastname *string `json:"last_name,omitempty"`
|
Lastname *string `json:"last_name,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"`
|
||||||
}
|
}
|
||||||
|
|||||||
+23
-22
@@ -7,35 +7,36 @@ import (
|
|||||||
"github.com/google/uuid"
|
"github.com/google/uuid"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
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,omitempty"`
|
Firstname *string `json:"firstname,omitempty"`
|
||||||
Lastname *string `json:"lastname,omitempty"`
|
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"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func InitUserProfile(usr *User) (usrProfile *UserProfile, err error) {
|
func InitUserProfile(usr *User) (usrProfile *UserProfile, err error) {
|
||||||
if usr == nil {
|
if usr == nil {
|
||||||
return nil, fmt.Errorf("User is empty")
|
return nil, fmt.Errorf("User is empty")
|
||||||
} else {
|
} else {
|
||||||
usrProfile = new(UserProfile)
|
usrProfile = new(UserProfile)
|
||||||
usrProfile.UserId = usr.Id
|
usrProfile.UserId = usr.Id
|
||||||
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 {
|
||||||
usrProfile.LastLogin = usr.LastLogin
|
usrProfile.LastLogin = usr.LastLogin
|
||||||
}
|
}
|
||||||
|
|
||||||
return usrProfile, nil
|
return usrProfile, nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user