-
Notifications
You must be signed in to change notification settings - Fork 4
Feature/members #50
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
drougojrom
wants to merge
20
commits into
cgrates-web:master
Choose a base branch
from
drougojrom:feature/members
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Feature/members #50
Changes from all commits
Commits
Show all changes
20 commits
Select commit
Hold shift + click to select a range
e0da567
mix
8ceda47
update
81c1dbb
extra fields method
b09034d
test for extra
4bd20e9
fixes after review
2d40148
response json updated
b189bde
swagger docs
c81a920
initial cache
1ee630a
initial cache
b849ddb
response updated
dcc3f1b
response typespec, lazy init
37d78c6
passed a fn into a param; updated spec and module
99094ee
membership - init
1124767
typo fix
dc0b483
typo fix
c5e7553
failed tests
52161f9
factory, index test fixes
07d832a
show test - added
e25458b
controller tests fixed
a8537cd
tests fixes
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| defmodule CgratesWebJsonapi.EtsCache do | ||
| @moduledoc """ | ||
| Cache via ETS. | ||
| """ | ||
|
|
||
| @spec get(any, atom | :ets.tid(), any) :: list(any) | ||
| def get(args, table_name, opts \\ []) do | ||
| case lookup(args, table_name) do | ||
| nil -> | ||
| ttl = Keyword.get(opts, :ttl, 86400) | ||
| cache_apply(args.(), ttl) | ||
|
|
||
| result -> | ||
| result | ||
| end | ||
| end | ||
|
|
||
| defp lookup(args, table_name) do | ||
| maybe_create_table(table_name) | ||
|
|
||
| case :ets.lookup(table_name, [args]) do | ||
| [result | _] -> check_freshness(result) | ||
| [] -> nil | ||
| end | ||
| end | ||
|
|
||
| defp check_freshness({result, expiration}) do | ||
| cond do | ||
| expiration > :os.system_time(:seconds) -> result | ||
| :else -> nil | ||
| end | ||
| end | ||
|
|
||
| defp cache_apply(args, ttl) do | ||
| result = args | ||
| expiration = :os.system_time(:seconds) + ttl | ||
| :ets.insert(:extra_fields, {args, result, expiration}) | ||
| result | ||
| end | ||
|
|
||
| defp maybe_create_table(table_name) do | ||
| if Enum.member?(:ets.all(), table_name) == false do | ||
| :ets.new(table_name, [:public, :named_table]) | ||
| end | ||
| end | ||
| end |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| defmodule CgratesWebJsonapi.Tenants.Membership do | ||
| use Ecto.Schema | ||
| import Ecto.Changeset | ||
|
|
||
| alias CgratesWebJsonapi.Tenants.Tenant | ||
| alias CgratesWebJsonapi.Auth.User | ||
|
|
||
| schema "memberships" do | ||
| field :role, :integer | ||
| belongs_to :tenant, Tenant, type: :string | ||
| belongs_to :user, User | ||
|
|
||
| timestamps() | ||
| end | ||
|
|
||
| @doc false | ||
| def changeset(membership, attrs) do | ||
| membership | ||
| |> cast(attrs, [:role]) | ||
| |> validate_required([:role]) | ||
| end | ||
| end |
22 changes: 22 additions & 0 deletions
22
lib/cgrates_web_jsonapi_web/controllers/cdr_extra_field_controller.ex
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| defmodule CgratesWebJsonapiWeb.CdrExtraFieldController do | ||
| use CgratesWebJsonapiWeb, :controller | ||
| use PhoenixSwagger | ||
|
|
||
| alias CgratesWebJsonapi.Cdrs | ||
| alias CgratesWebJsonapi.EtsCache | ||
|
|
||
| swagger_path :index do | ||
| get("/api/cdr-extra-fields") | ||
| CommonSwaggerParams.authorization() | ||
| CommonSwaggerParams.content_type() | ||
|
|
||
| description("An array of string values of used extra_fields") | ||
|
|
||
| response(200, "OK") | ||
| end | ||
|
|
||
| def index(conn, _) do | ||
| extra_fields = fn -> Cdrs.extra() end | ||
| render(conn, "extra_fields.json", data: EtsCache.get(extra_fields, :extra_fields)) | ||
| end | ||
| end |
42 changes: 42 additions & 0 deletions
42
lib/cgrates_web_jsonapi_web/controllers/membership_controller.ex
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| defmodule CgratesWebJsonapiWeb.MembershipController do | ||
| use CgratesWebJsonapiWeb, :controller | ||
|
|
||
| alias CgratesWebJsonapi.Tenants | ||
| alias CgratesWebJsonapi.Tenants.Membership | ||
|
|
||
| def index(conn, _params) do | ||
| memberships = Tenants.list_memberships() | ||
| render(conn, "index.json", memberships: memberships) | ||
| end | ||
|
|
||
| def create(conn, %{"membership" => membership_params}) do | ||
| with {:ok, %Membership{} = membership} <- Tenants.create_membership(membership_params) do | ||
| conn | ||
| |> put_status(:created) | ||
| |> put_resp_header("location", Routes.membership_path(conn, :show, membership)) | ||
| |> render("show.json", membership: membership) | ||
| end | ||
| end | ||
|
|
||
| def show(conn, %{"id" => id}) do | ||
| membership = Tenants.get_membership!(id) | ||
| render(conn, "show.json", membership: membership) | ||
| end | ||
|
|
||
| def update(conn, %{"id" => id, "membership" => membership_params}) do | ||
| membership = Tenants.get_membership!(id) | ||
|
|
||
| with {:ok, %Membership{} = membership} <- | ||
| Tenants.update_membership(membership, membership_params) do | ||
| render(conn, "show.json", membership: membership) | ||
| end | ||
| end | ||
|
|
||
| def delete(conn, %{"id" => id}) do | ||
| membership = Tenants.get_membership!(id) | ||
|
|
||
| with {:ok, %Membership{}} <- Tenants.delete_membership(membership) do | ||
| send_resp(conn, :no_content, "") | ||
| end | ||
| end | ||
| end | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| defmodule CgratesWebJsonapiWeb.CdrExtraFieldView do | ||
| use CgratesWebJsonapiWeb, :view | ||
| use JaSerializer.PhoenixView | ||
|
|
||
| def render("extra_fields.json", %{data: data}), do: data | ||
| end |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| defmodule CgratesWebJsonapiWeb.MembershipView do | ||
| use CgratesWebJsonapiWeb, :view | ||
| alias CgratesWebJsonapiWeb.MembershipView | ||
|
|
||
| def render("index.json", %{memberships: memberships}) do | ||
| %{data: render_many(memberships, MembershipView, "membership.json")} | ||
| end | ||
|
|
||
| def render("show.json", %{membership: membership}) do | ||
| %{data: render_one(membership, MembershipView, "membership.json")} | ||
| end | ||
|
|
||
| def render("membership.json", %{membership: membership}) do | ||
| %{id: membership.id, role: membership.role} | ||
| end | ||
| end |
16 changes: 16 additions & 0 deletions
16
priv/repo/migrations/20210517174717_create_memberships.exs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| defmodule CgratesWebJsonapi.Repo.Migrations.CreateMemberships do | ||
| use Ecto.Migration | ||
|
|
||
| def change do | ||
| create table(:memberships) do | ||
| add(:role, :integer) | ||
| add(:tenant_id, references(:tenants, on_delete: :nothing, type: :string)) | ||
| add(:user_id, references(:users, on_delete: :nothing)) | ||
|
|
||
| timestamps() | ||
| end | ||
|
|
||
| create(index(:memberships, [:tenant_id])) | ||
| create(index(:memberships, [:user_id])) | ||
| end | ||
| end |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Add swagger docs plz