customprojects/bordro-esleme
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

comnpany to cm

Browse Source
This commit is contained in:
ctengiz
2024-06-14 17:19:38 +03:00
parent a28576960e
commit f54c5660ea
15 changed files with 50 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
svc/api/acompany.go
View File

@@ -5,7 +5,7 @@ import (
"git.makki.io/makki/libgo/cmn"
"git.makki.io/makki/libgo/dbu"
"git.makki.io/makki/libgo/mhttp"
"git.makki.io/makki/libgo/nauth"
"git.notitek.com.tr/common/notgo/nauth"
"github.com/go-chi/chi/v5"
"net/http"
)
@@ -146,7 +146,7 @@ func companyList(w http.ResponseWriter, r *http.Request) {
return
}
rp, err := dbu.NewRepoWithFile(r.Context(), "company", nil)
rp, err := dbu.NewRepoWithFile(r.Context(), "cm", nil)
if err != nil {
mhttp.InternalServerError(w, err)
return

4
svc/api/atmpl.go
View File

@@ -19,7 +19,7 @@ func tmplPost(w http.ResponseWriter, r *http.Request) {
return
}
sq := "update company set tmpl = $2 where id = $1"
sq := "update cm set tmpl = $2 where id = $1"
_, err = dbu.DB.Exec(r.Context(), sq, companyID, body)
if err != nil {
mhttp.InternalServerError(w, err)
@@ -33,7 +33,7 @@ func tmplGet(w http.ResponseWriter, r *http.Request) {
companyID := cmn.StrToInt64(chi.URLParam(r, "companyID"))
var body json.RawMessage
sq := "select tmpl from company where id = $1"
sq := "select tmpl from cm where id = $1"
err := dbu.DB.QueryRow(r.Context(), sq, companyID).Scan(&body)
if err != nil {
mhttp.InternalServerError(w, err)

18
svc/api/public/login.go
View File

@@ -1,18 +0,0 @@
package public
import (
"git.makki.io/makki/libgo/mhttp"
"git.makki.io/makki/libgo/svc"
"net/http"
)
func login(w http.ResponseWriter, r *http.Request) {
authResp, err := svc.S.Authenticate(r)
if err != nil {
mhttp.InternalServerError(w, err)
return
}
clientResp := authResp.GetEndUserResponse()
mhttp.ResponseSuccess(w, clientResp)
}

14
svc/api/public/zrouter.go
View File

@@ -1,14 +0,0 @@
package public
import (
"github.com/go-chi/chi/v5"
"net/http"
)
func Router() http.Handler {
r := chi.NewRouter()
// user authentication
r.Post("/login", login)
return r
}

8
svc/api/zhandler.go
View File

@@ -1,10 +1,9 @@
package api
import (
"bordro-esleme/api/public"
"fmt"
"git.makki.io/makki/libgo/napi"
"git.makki.io/makki/libgo/nauth"
"git.notitek.com.tr/common/notgo/napi"
"git.notitek.com.tr/common/notgo/nauth"
"net/http"
"os"
"path"
@@ -51,8 +50,7 @@ func HttpHandler(re enums.TRunEnv) http.Handler {
mux.Route("/api", func(mr chi.Router) {
// Public Route endpoints
mr.Mount("/", public.Router())
//mr.Mount("/admin", admin.Router())
mr.Post("/login", napi.Login)
//protected end points
mr.Group(func(r chi.Router) {

3
svc/main.go
View File

@@ -5,6 +5,7 @@ import (
"git.makki.io/makki/libgo/dbu"
"git.makki.io/makki/libgo/mlog"
"git.makki.io/makki/libgo/svc"
"git.notitek.com.tr/common/notgo/nauth"
"time"
)
@@ -35,7 +36,7 @@ func main() {
if svc.S.DevMode() {
expire = time.Hour * 48
}
err = s.SubscribeToAuthServer(expire)
err = nauth.SubscribeToAuthServer(s.Ctx, expire)
if err != nil {
mlog.Fatal(err)
}

20
svc/model/company/company.go
View File

@@ -9,10 +9,10 @@ import (
)
type Company struct {
Clid int64 `db:"clid" json:"-"`
ClID int64 `db:"clid" json:"-"`
ID int64 `db:"id"`
Code string `db:"code"`
Title null.String `db:"title"`
Name null.String `db:"name"`
IsActive bool `db:"is_active"`
Notes null.String `db:"notes"`
@@ -30,7 +30,7 @@ func New() *Company {
}
func DbRead(ctx context.Context, id int64) (*Company, error) {
rp, err := dbu.NewRepoWithFile(ctx, "company", nil)
rp, err := dbu.NewRepoWithFile(ctx, "cm", nil)
if err != nil {
return nil, err
}
@@ -55,7 +55,7 @@ func DbDelete(ctx context.Context, id int64, log bool, usrID *int64) error {
}
defer tx.Rollback(ctx)
rp, err := dbu.NewRepoWithFile(ctx, "company", tx)
rp, err := dbu.NewRepoWithFile(ctx, "cm", tx)
if err != nil {
return err
}
@@ -66,7 +66,7 @@ func DbDelete(ctx context.Context, id int64, log bool, usrID *int64) error {
if err != nil {
return dbu.ParsedErrSuppressNoRows(err)
}
err = dbu.DB.LogDMLTx("d", "company", oldData.ID, usrID, "", oldData, nil, tx)
err = dbu.DB.LogDMLTx("d", "cm", oldData.ID, usrID, "", oldData, nil, tx)
if err != nil {
slog.Error(err.Error())
}
@@ -81,9 +81,9 @@ func DbDelete(ctx context.Context, id int64, log bool, usrID *int64) error {
}
func (m *Company) DbCreate(ctx context.Context, clID int64, log bool, usrID *int64) error {
m.Clid = clID
m.ClID = clID
rp, err := dbu.NewRepoWithFile(ctx, "company", nil)
rp, err := dbu.NewRepoWithFile(ctx, "cm", nil)
if err != nil {
return err
}
@@ -94,7 +94,7 @@ func (m *Company) DbCreate(ctx context.Context, clID int64, log bool, usrID *int
}
if log {
err = dbu.DB.LogDMLTx("c", "company", m.ID, usrID, "", nil, m, nil)
err = dbu.DB.LogDMLTx("c", "cm", m.ID, usrID, "", nil, m, nil)
if err != nil {
slog.Error(err.Error())
}
@@ -110,7 +110,7 @@ func (m *Company) DbUpdate(ctx context.Context, log bool, usrID *int64) error {
}
defer tx.Rollback(ctx)
rp, err := dbu.NewRepoWithFile(ctx, "company", tx)
rp, err := dbu.NewRepoWithFile(ctx, "cm", tx)
if err != nil {
return err
}
@@ -121,7 +121,7 @@ func (m *Company) DbUpdate(ctx context.Context, log bool, usrID *int64) error {
if err != nil {
return err
}
err = dbu.DB.LogDMLTx("u", "company", oldData.ID, usrID, "", oldData, m, tx)
err = dbu.DB.LogDMLTx("u", "cm", oldData.ID, usrID, "", oldData, m, tx)
if err != nil {
slog.Error(err.Error())
}